diff --git a/app/build.gradle b/app/build.gradle
index eea80eb..a5d68cf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,6 +32,7 @@
     implementation 'androidx.navigation:navigation-ui:2.2.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.media2:media2-exoplayer:1.0.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28a3291..3d01c29 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.ntlab.amaryllis.client">
     <!--
          The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
@@ -10,6 +11,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
         android:name=".Amaryllis"
@@ -20,7 +22,27 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-        <activity android:name=".VoiceActivity" />
+        <activity android:name=".TestPlayActivity">
+        </activity>
+        <service
+            android:name=".entities.AmaryllisBackgroundService"
+            android:exported="false" />
+
+        <activity android:name=".VoiceActivity" >
+
+        </activity>
+        <service android:name=".voiceservice.TestVoiceService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="org.ntlab.amaryllis.client.voiceservice.ACTION_TOGGLE" />
+                <action android:name="org.ntlab.amaryllis.client.voiceservice.ACTION_PLAY" />
+            </intent-filter>
+        </service>
+        <receiver android:name=".voiceservice.VoicememoReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
              (See the file "res/values/google_maps_api.xml").
@@ -49,6 +71,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".MainActivity" />
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
index 96d4b0a..bebc9ad 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
@@ -1,16 +1,35 @@
 package org.ntlab.amaryllis.client;
 
 import android.app.Application;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.location.Location;
+
+import org.ntlab.amaryllis.client.entities.AmaryllisBackgroundService;
+import org.ntlab.amaryllis.client.entities.PlayListListener;
+import org.ntlab.amaryllis.client.voiceservice.VoiceMemo;
+
+import java.util.ArrayList;
 
 public class Amaryllis extends Application {
     private String token = null;
     private String uid = null;
     private String password=null;
-    private String latitude=null;
-    private String longitude=null;
-    private String data=null;
-    
+    private String name = null;
+    private String new_introduction = null;
+    private Location location;
+    private ArrayList<PlayListListener> playListListeners;
+    private int index=0;
+    AmaryllisBackgroundService amaryllisbackgroundservice;
+    private ArrayList<VoiceMemo> playList;
+
+//    public Amaryllis(){
+//        super();
+//        Intent intent=new Intent(this,amaryllisbackgroundservice.getClass());
+//        startService(intent);
+//        amaryllisbackgroundservice=(AmaryllisBackgroundService)getApplicationContext();
+//       for(PlayListListener pl: playListListeners) amaryllisbackgroundservice.subscribe(pl);
+//    }
     public void setUid(String uid) {
         SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
         SharedPreferences.Editor editor = prefData.edit();
@@ -41,12 +60,43 @@
         return password;
     }
 
+    public void setName(String name) {
+        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefData.edit();
+        editor.putString("name", name);
+        editor.commit();
+    }
+
+    public String getName() {
+        if(name == null){
+            SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
+            name = prefData.getString("name", "");
+        }
+        return name;
+    }
+
+    public void setIntroduction(String new_introduction) {
+        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefData.edit();
+        editor.putString("new_introduction", new_introduction);
+        editor.commit();
+    }
+
+    public String getIntroduction() {
+        if(new_introduction == null){
+            SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
+            new_introduction = prefData.getString("new_introduction", "");
+        }
+        return new_introduction;
+    }
+
     public void setToken(String token) {
         SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
         SharedPreferences.Editor editor = prefData.edit();
         editor.putString("token", token);
         editor.commit();
     }
+
     public String getToken() {
         if(token == null){
             SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
@@ -55,41 +105,20 @@
         return token;
     }
 
-    public void setLatitude(String latitude) {
-        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-        SharedPreferences.Editor editor = prefData.edit();
-        editor.putString("latitude", latitude);
-        editor.commit();
-    }
-    public String getLatitude() {
-        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-        latitude = prefData.getString("latitude","");
-        return latitude;
+    public void setLocation(Location loc){
+        location=loc;
     }
 
-    public void setLongitude(String longitude) {
-        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-        SharedPreferences.Editor editor = prefData.edit();
-        editor.putString("longitude", longitude);
-        editor.commit();
+    public Location getLocation(){
+        return location;
     }
 
-    public String getLongitude() {
-        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-        longitude = prefData.getString("longitude","" );
-        return longitude;
+
+    public AmaryllisBackgroundService getBackgroundService() {
+        return amaryllisbackgroundservice;
     }
 
-    public void setData(String VoiceData) {
-        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-        SharedPreferences.Editor editor = prefData.edit();
-        editor.putString("VoiceData", VoiceData);
-        editor.commit();
-    }
-    public String getData() {
-        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-        data = prefData.getString("VoiceData","");
-        return data;
+    public void getPlayList(){
     }
 
 }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
index 5afa53f..8fe1519 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
@@ -10,8 +10,8 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
-import org.ntlab.amaryllis.client.entities.LoginJson;
 import org.ntlab.amaryllis.client.entities.SignUpJson;
 import org.ntlab.amaryllis.client.resources.AccountsRest;
 
@@ -24,8 +24,8 @@
 public class LoginActivity extends AppCompatActivity implements TextWatcher {
     TextView passWordTextView;
     EditText passWordEditText;
-    TextView uidTextView;
-    EditText uidEditText;
+    TextView nameTextView;
+    EditText nameText;
     Button loginButton;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -37,30 +37,38 @@
                 .build();
         final AccountsRest LoginService = retrofit.create(AccountsRest.class);
         setContentView(R.layout.activity_login);
+        nameText = (EditText) findViewById(R.id.name);
+        nameText.addTextChangedListener(this);
+        nameTextView = findViewById(R.id.name);
         passWordEditText = (EditText) findViewById(R.id.passWord);
         passWordEditText.addTextChangedListener(this);
         passWordTextView = findViewById(R.id.passWord);
-        uidEditText = (EditText) findViewById(R.id.uid);
-        uidEditText.addTextChangedListener(this);
-        uidTextView = findViewById(R.id.uid);
         loginButton = (Button)findViewById(R.id.login);
         loginButton.setEnabled(false);
-        uidEditText.setText( ((Amaryllis) getApplication()).getUid());
         loginButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-               Call<LoginJson> call = LoginService.accountLogin(uidEditText.getText().toString(),passWordEditText.getText().toString());
-                call.enqueue(new Callback<LoginJson>(){
+               Call<SignUpJson> call = LoginService.putAccounts(nameText.getText().toString(),passWordEditText.getText().toString());
+                call.enqueue(new Callback<SignUpJson>(){
                     @Override
-                    public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
-                        LoginJson loginJson =response.body();
-                        Amaryllis app = (Amaryllis) getApplication();
-                        app.setToken(loginJson.getToken());
-                        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-                        startActivity(intent);
+                    public void onResponse(Call<SignUpJson> call, Response<SignUpJson> response) {
+                        if (response.isSuccessful()) {
+                            SignUpJson signUpJson =response.body();
+                            Amaryllis app = (Amaryllis) getApplication();
+                            app.setToken(signUpJson.getToken());
+                            app.setUid(nameText.getText().toString());
+                            app.setPassword(passWordEditText.getText().toString());
+                            app.setName(nameText.getText().toString());
+                            Intent intent = new Intent(getApplication(), MainActivity.class);
+                            startActivity(intent);
+                            finish();
+                        }else {
+                            Toast.makeText(LoginActivity.this,
+                                    "nameもしくはパスワードが違います", Toast.LENGTH_SHORT).show();
+                        }
                     }
 
                     @Override
-                    public void onFailure(Call<LoginJson> call, Throwable t) {
+                    public void onFailure(Call<SignUpJson> call, Throwable t) {
                     }
                 });
             }
@@ -80,7 +88,7 @@
 
     @Override
     public void afterTextChanged(Editable s) {
-        if(passWordTextView.length()>3 && uidTextView.length()>0 ){
+        if(passWordTextView.length()>3 && nameTextView.length()>0 ){
             loginButton.setEnabled(true);
         }
         else{
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
index a65d763..cd8727d 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
@@ -24,15 +24,26 @@
 import android.os.Debug;
 import android.provider.Settings;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageButton;
 import android.widget.Toast;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
+import org.ntlab.amaryllis.client.entities.Category;
 import org.ntlab.amaryllis.client.fragment.MapsFragment;
 import org.ntlab.amaryllis.client.resources.AccountsRest;
+import org.ntlab.amaryllis.client.resources.CategoriesRest;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
 
@@ -42,6 +53,15 @@
     private static final String TAG = MainActivity.class.getSimpleName();
     LocationManager locationManager;
     private ArrayList<LocationListener> listeners = new ArrayList<>();
+    private HashMap<String ,Category> categories;
+    private ArrayList<String> checkedList = new ArrayList<>();
+    HashMap<Integer,String> menuItemMap = new HashMap<>();
+    ImageButton playbutton;
+    ImageButton stopbutton;
+    ImageButton skipbutton;
+
+    int playfrag=0;
+    int stopfrag=0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,33 +76,68 @@
         NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
         NavigationUI.setupWithNavController(navView, navController);
 
-//        if (ContextCompat.checkSelfPermission(this,
-//                Manifest.permission.ACCESS_FINE_LOCATION) !=
-//                PackageManager.PERMISSION_GRANTED) {
-//            ActivityCompat.requestPermissions(this,
-//                    new String[]{Manifest.permission.ACCESS_FINE_LOCATION,},
-//                    1000);
-//        }
-//        else{
-//            locationStart();
-//            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 100, 50, this);
-//
-//
-//        }
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+        final CategoriesRest categoryService = retrofit.create(CategoriesRest.class);
+        Call<List<Category>> call = categoryService.getcategories();
+        call.enqueue(new Callback<List<Category>>() {
+            @Override
+            public void onResponse(Call<List<Category>> call, Response<List<Category>> response) {
+                List<Category> clist = response.body();
+                HashMap<String ,Category> categories = new HashMap<>();
+                for (Category c : clist){
+                    categories.put(c.getcId(),c);
+                }
+                MainActivity.this.categories = categories;
+            }
+
+            @Override
+            public void onFailure(Call<List<Category>> call, Throwable t) {
+
+            }
+
+        });
+
+        //収音関係のボタンの処理
+        playbutton = (ImageButton)findViewById(R.id.playbutton);
+        playbutton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                playfrag++;
+                if((playfrag%2)==0){
+                    //こっち側がオフ
+                }else{
+                    //こっち側がオン
+                }
+            }
+        });
+        stopbutton = (ImageButton)findViewById(R.id.stopbutton);
+        stopbutton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                stopfrag++;
+                if((stopfrag%2)==0){
+                    //こっち側がオフ
+                }else{
+                    //こっち側がオン
+                }
+            }
+        });
+        skipbutton = (ImageButton)findViewById(R.id.skipbutton);
+        skipbutton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+
+            }
+        });
+
 
         LocationManager manager = (LocationManager) getSystemService(LOCATION_SERVICE);
         if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            // TODO: Consider calling
-            //    ActivityCompat#requestPermissions
-            // here to request the missing permissions, and then overriding
-            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-            //                                          int[] grantResults)
-            // to handle the case where the user grants the permission. See the documentation
-            // for ActivityCompat#requestPermissions for more details.
             return;
         }
         manager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
     }
+
     private void locationStart(){
         Log.d("debug","locationStart()");
 
@@ -109,23 +164,10 @@
             Log.d("debug", "checkSelfPermission false");
             return;
         }
-
-       // locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 50, this);
-
     }
 
     // 結果の受け取り
-    /**
-     * Android Quickstart:
-     * https://developers.google.com/sheets/api/quickstart/android
-     *
-     * Respond to requests for permissions at runtime for API 23 and above.
-     * @param requestCode The request code passed in
-     *     requestPermissions(android.app.Activity, String, int, String[])
-     * @param permissions The requested permissions. Never null.
-     * @param grantResults The grant results for the corresponding permissions
-     *     which is either PERMISSION_GRANTED or PERMISSION_DENIED. Never null.
-     */
+
     @Override
     public void onRequestPermissionsResult(
             int requestCode, @NonNull String[]permissions, @NonNull int[] grantResults) {
@@ -147,19 +189,6 @@
 
     @Override
     public void onStatusChanged(String provider, int status, Bundle extras) {
-//         API 29以降非推奨
-
-//        switch (status) {
-//            case LocationProvider.AVAILABLE:
-//                Log.d("debug", "LocationProvider.AVAILABLE");
-//                break;
-//            case LocationProvider.OUT_OF_SERVICE:
-//                Log.d("debug", "LocationProvider.OUT_OF_SERVICE");
-//                break;
-//            case LocationProvider.TEMPORARILY_UNAVAILABLE:
-//                Log.d("debug", "LocationProvider.TEMPORARILY_UNAVAILABLE");
-//                break;
-//        }
 
     }
 
@@ -171,12 +200,6 @@
     }
     @Override
     public void onLocationChanged(Location location) {
-//        Amaryllis amaryllis = (Amaryllis) getApplication();
-//        String latitude = String.valueOf(location.getLatitude());
-//        String longitude = String.valueOf(location.getLongitude());
-//        amaryllis.setLatitude(latitude);
-//        amaryllis.setLongitude(longitude);
-
         Log.d(TAG, "lat:" + location.getLatitude());
         Log.d(TAG, "lon:" + location.getLongitude());
         Log.d("debug", "locationChanged" );
@@ -201,12 +224,56 @@
 
     public void method() {
         Amaryllis amaryllis =(Amaryllis) getApplication();
-        amaryllis.setUid("");
         amaryllis.setPassword("");
+        amaryllis.setName("");
+        amaryllis.setUid("");
     }
-    public void logout(){
-        Intent intent = new Intent(MainActivity.this, LoginActivity.class);
+
+    public void logout() {
+        Intent intent = new Intent(getApplication(), LoginActivity.class);
         startActivity(intent);
-        finish();
+        android.os.Process.killProcess(android.os.Process.myPid());
     }
+
+    public Category getCategory(String cid){
+        return categories.get(cid);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.nav_drawer_menu, menu);
+
+        //カテゴリーの数だけitemを定義
+        int id=0;
+        for(Category category : categories.values()){
+            String name = category.getName();
+            String cid = category.getcId();
+            MenuItem newItem = menu.add(Menu.NONE, id, Menu.NONE, name);
+            menuItemMap.put(newItem.getItemId(),cid);
+            newItem.setCheckable(true);
+            newItem.setChecked(true);
+            checkedList.add(cid);
+            id++;
+        }
+        return true;
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        String cid = menuItemMap.get(item.getItemId());
+
+        item.setChecked(!item.isChecked());
+        if(item.isChecked()){
+            checkedList.add(cid);
+        }else{
+            checkedList.remove(cid);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public ArrayList getCheckedCidList() {
+        return checkedList;
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
index ed0703b..ba4cf1c 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
@@ -7,11 +7,13 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.ntlab.amaryllis.client.entities.LoginJson;
 import org.ntlab.amaryllis.client.entities.SignUpJson;
@@ -43,9 +45,9 @@
         Amaryllis amaryllis =(Amaryllis) getApplication();
         String uid = amaryllis.getUid();
         String passWord = amaryllis.getPassword();
-        if(uid.length() != 0 && passWord.length() != 0){
+        if(TextUtils.isEmpty(uid) == false && TextUtils.isEmpty(passWord) == false){
             signUpService.accountLogin(uid,passWord);
-            Intent intent = new Intent(SignUpActivity.this, MainActivity.class);
+            Intent intent = new Intent(getApplication(), MainActivity.class);
             startActivity(intent);
             finish();
         }
@@ -70,14 +72,21 @@
                 call.enqueue(new Callback<SignUpJson>(){
                     @Override
                     public void onResponse(Call<SignUpJson> call, Response<SignUpJson> response) {
-                        SignUpJson signUpJson =response.body();
-                        String token = signUpJson.getToken();
-                        Amaryllis amaryllis = (Amaryllis) getApplication();
-                        amaryllis.setToken(token);
-                        amaryllis.setUid(signUpJson.getUid());
-                        Intent intent = new Intent(SignUpActivity.this, MainActivity.class);
-                        startActivity(intent);
-                        finish();
+                        if (response.isSuccessful()) {
+                            SignUpJson signUpJson = response.body();
+                            String token = signUpJson.getToken();
+                            Amaryllis amaryllis = (Amaryllis) getApplication();
+                            amaryllis.setToken(token);
+                            amaryllis.setUid(signUpJson.getUid());
+                            amaryllis.setPassword(passWordEditText.getText().toString());
+                            amaryllis.setName(nameEditText.getText().toString());
+                            Intent intent = new Intent(getApplication(), MainActivity.class);
+                            startActivity(intent);
+                            finish();
+                        }else {
+                            Toast.makeText(SignUpActivity.this,
+                                    "既にその名前のアカウントが存在します。", Toast.LENGTH_SHORT).show();
+                        }
                     }
 
                     @Override
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/TestPlayActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/TestPlayActivity.java
new file mode 100644
index 0000000..82783be
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/TestPlayActivity.java
@@ -0,0 +1,96 @@
+package org.ntlab.amaryllis.client;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.v4.media.session.MediaControllerCompat;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.ntlab.amaryllis.client.voiceservice.TestVoiceService;
+
+public class TestPlayActivity extends AppCompatActivity {
+
+    Button button_connect;
+    Button button_play;
+    TextView textView_title;
+    TextView textView_position;
+
+    TestVoiceService myService;
+    Intent serviceIntent;
+    MediaControllerCompat mediaController;
+    Button mPlayButton;
+    ServiceConnection serviceConnection = new ServiceConnection(){
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            myService = ((TestVoiceService.MyBinder)service).getService();
+            try {
+                mediaController=new MediaControllerCompat(TestPlayActivity.this,myService.getToken());
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+            //myService.setMessage("Hello, IBinder!");
+            //startService(serviceIntent);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            myService = null;
+        }
+    };
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_test_play);
+
+        button_connect =findViewById(R.id.button_connect);
+        button_play=findViewById(R.id.button_play);
+        button_play.setEnabled(false);
+        //textView_title=findViewById(R.id.textView_title);
+       // textView_position=findViewById(R.id.textView_position);
+        serviceIntent=new Intent(
+                getBaseContext(),TestVoiceService.class
+        );
+
+        button_connect.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //serviceIntent.setAction(TestVoiceService.ACTION_PLAY);
+                //startService(serviceIntent);
+                bindService(serviceIntent,serviceConnection, Context.BIND_AUTO_CREATE);
+                button_play.setEnabled(true);
+                if(myService!=null)myService.testCall();
+            }
+        });
+        button_play.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+               mediaController.getTransportControls().play();
+            }
+        });
+
+
+
+        /*
+        button_play.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                  myService.play();
+            }
+        });
+        */
+
+        //mPlayButton = (Button) findViewById(R.id.play);
+        //mPlayButton.setOnClickListener(this);
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/AmaryllisBackgroundService.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/AmaryllisBackgroundService.java
new file mode 100644
index 0000000..7ef7aa6
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/AmaryllisBackgroundService.java
@@ -0,0 +1,112 @@
+package org.ntlab.amaryllis.client.entities;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.location.Location;
+import android.location.LocationListener;
+import android.os.Bundle;
+
+import org.ntlab.amaryllis.client.resources.VoicememosRest;
+import org.ntlab.amaryllis.client.voiceservice.PlayListManager;
+import org.ntlab.amaryllis.client.voiceservice.VoiceMemo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+
+
+public class AmaryllisBackgroundService extends IntentService implements LocationListener {
+    private ArrayList<PlayListListener> playListListeners;
+    private PlayListManager playListManager;
+    private double longitude,latitude;
+    private int i=0;
+    public AmaryllisBackgroundService() {
+        super("AmaryllisBackgroundService");
+        playListListeners=new ArrayList<>();
+
+    }
+//    ArrayList<String> Lat;
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+        final VoicememosRest voicememosRest=retrofit.create(VoicememosRest.class);
+        Call<List<VoiceMemo>> call=voicememosRest.getVoicememos(145.0,0.0,145.0,0.0);
+        call.enqueue(new Callback<List<VoiceMemo>>() {
+            @Override
+            public void onResponse(Call<List<VoiceMemo>> call, Response<List<VoiceMemo>> response) {
+                List<VoiceMemo> voicememos =  response.body();
+                float distance[] = new float[voicememos.size()];
+                ArrayList<VoiceMemo> t = new ArrayList<>();
+                for(VoiceMemo v:voicememos){
+                    double lat=v.getLatitude();
+                    double lon=v.getLongitude();
+                    Location.distanceBetween(latitude,longitude,lat,lon,distance);
+                    if (distance[i] < 50){
+                        //ここにPlayListManagerへ投稿を送る
+                        t.add(v);
+                    }
+                    i++;
+                }
+                playListManager.addVoiceMemos(t);
+            }
+
+            @Override
+            public void onFailure(Call<List<VoiceMemo>> call, Throwable t) {
+
+            }
+        });
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+
+    }
+
+    public void subscribe(PlayListListener playListListener){
+        playListListeners.add(playListListener);
+    }
+    public PlayListManager getPlayListManager(){
+        return playListManager;
+    }
+
+    private void callPlayNext(Voicememo voicememo){
+        for(PlayListListener pl:playListListeners)pl.onPlayNext(voicememo);
+    }
+    private void callPlayEnd(){
+        for(PlayListListener pl:playListListeners)pl.onPlayEnd();
+    }
+
+
+//    ArrayList<> 変数名 = new ArrayList<Float>();
+
+    @Override
+    public void onLocationChanged(Location location) {
+        longitude=location.getLongitude();
+        latitude=location.getLatitude();
+    }
+
+    @Override
+    public void onStatusChanged(String s, int i, Bundle bundle) {
+    }
+
+    @Override
+    public void onProviderEnabled(String s) {
+
+    }
+
+    @Override
+    public void onProviderDisabled(String s) {
+
+    }
+
+}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java
index 3e44534..64656ed 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/Category.java
@@ -9,30 +9,28 @@
      * 文字列表現された色情報
      */
     private String color;
+
+    public Category(){}
+
     public Category(String cid,String name,String color){
-        this.cid=cid;
-        this.name=name;
-        this.color=color;
+        setcId(cid);
+        setName(name);
+        setColor(color);
     }
 
     public String getcId() {
         return cid;
     }
-
     public String getName() {
         return name;
     }
     public String getColor(){
         return color;
     }
-    public void setCid(String cid) {
-        this.cid = cid;
-    }
-
+    public void setcId(String cid) { this.cid = cid; }
     public void setName(String name) {
         this.name = name;
     }
-
     public void setColor(String color) {
         this.color = color;
     }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/MessageJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/MessageJson.java
new file mode 100644
index 0000000..b1b7c55
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/MessageJson.java
@@ -0,0 +1,11 @@
+package org.ntlab.amaryllis.client.entities;
+
+public class MessageJson {
+    private String message;
+    public MessageJson(String message) {
+        this.message = message;
+    }
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/PlayListListener.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/PlayListListener.java
new file mode 100644
index 0000000..05ec5dc
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/PlayListListener.java
@@ -0,0 +1,6 @@
+package org.ntlab.amaryllis.client.entities;
+
+public interface PlayListListener {
+    public void onPlayNext(Voicememo voicememo);
+    public void onPlayEnd();
+}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/PutIntroductionResponse.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/PutIntroductionResponse.java
deleted file mode 100644
index 7fd3839..0000000
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/PutIntroductionResponse.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.ntlab.amaryllis.client.entities;
-
-public class PutIntroductionResponse {
-}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java
index a7df8a7..42852a4 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/Voicememo.java
@@ -25,7 +25,10 @@
     private Integer favos;
     private ArrayList<String> categories;
     private HashMap<String, Comment> commentMap = new HashMap<>();
-    public Voicememo(String vid, String uid, Integer time, String url, double latitude, double longitude, String title, String summary,ArrayList<String> category) {
+
+    public Voicememo() {}
+
+    public Voicememo(String vid, String uid, Integer time, String url, double latitude, double longitude, String title, String summary, ArrayList<String> categories) {
         Calendar upload = Calendar.getInstance();
         setVid(vid);
         setUid(uid);
@@ -36,7 +39,7 @@
         setLongitude(longitude);
         setTitle(title);
         setSummary(summary);
-        //addCategory(category);
+        setCategory(categories);
         this.times = 0;
         this.favos = 0;
     }
@@ -98,15 +101,6 @@
     public void setSummary(String summary) {
         this.summary = summary;
     }
-
-    //public ArrayList<String> getcategory() {
-        //return category;
-    //}
-    //private void setcategory(ArrayList<String> category) {
-        //this.category = category;
-    //}
-
-
     public Integer getTimes() {
         return times;
     }
@@ -137,6 +131,11 @@
     private void setFavos(){
         favos = favolist.size();
     }
+
+    public void setCategory(ArrayList<String> categories) {
+        this.categories = categories;
+    }
+
     public ArrayList<String> getCategory(){ return categories; }
     public void addCategory(String categoryId){
         for (String a : categories) {
@@ -167,5 +166,4 @@
     public void removeComment(String commentId) {
         commentMap.remove(commentId);
     }
-
 }
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java
index 9597543..26f19b4 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java
@@ -6,16 +6,22 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+
+import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.EditText;
+import android.text.TextWatcher;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import org.ntlab.amaryllis.client.Amaryllis;
 import org.ntlab.amaryllis.client.MainActivity;
 import org.ntlab.amaryllis.client.R;
 import org.ntlab.amaryllis.client.SignUpActivity;
-import org.ntlab.amaryllis.client.entities.SignUpJson;
+import org.ntlab.amaryllis.client.entities.MessageJson;
 import org.ntlab.amaryllis.client.resources.AccountsRest;
 
 
@@ -30,7 +36,7 @@
  * Use the {@link AccountFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class AccountFragment extends Fragment {
+public class AccountFragment extends Fragment implements TextWatcher{
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -40,6 +46,11 @@
     // TODO: Rename and change types of parameters
     private String mParam1;
     private String mParam2;
+    TextView nameTextView;
+    EditText nameEditText;
+    TextView introductionTextView;
+    EditText introductionEditText;
+    Button changeButton;
     Button logoutButton;
 
     private static final int READ_REQUEST_CODE = 42;
@@ -80,6 +91,20 @@
                 .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
+        final AccountsRest accountsFragment = retrofit.create(AccountsRest.class);
+        final Amaryllis app =(Amaryllis) getActivity().getApplication();
+        final String uid = app.getUid();
+        final String token = app.getToken();
+        final String introduction;
+        nameEditText = (EditText)view.findViewById(R.id.name);
+        nameEditText.addTextChangedListener(this);
+        nameTextView = view.findViewById(R.id.name);
+        String name = app.getName();
+        nameEditText.setText(name);
+        introductionEditText =(EditText)view.findViewById(R.id.introduction);
+        introductionEditText.addTextChangedListener(this);
+        introductionTextView = view.findViewById(R.id.introduction);
+        changeButton = (Button)view.findViewById(R.id.change);
         logoutButton = (Button)view.findViewById(R.id.logout);
         logoutButton.setOnClickListener(new View.OnClickListener() {
            public void onClick(View v) {
@@ -87,10 +112,47 @@
                 ma.method();
                 ma.logout();
             }
+        });
+//        Call<MessageJson> call = accountsFragment.changeIntroduction(uid,token,introductionEditText.getText().toString());
+//        call.enqueue(new Callback<MessageJson>(){
+//            @Override
+//            public void onResponse(Call<MessageJson> call, Response<MessageJson> response) {
+//                MessageJson messageJson = response.body();
+//                Amaryllis app =(Amaryllis) getActivity().getApplication();
+//                app.setIntroduction(introductionEditText.getText().toString());
+//                System.out.println("RESPONSE!" );
+//            }
+//            @Override
+//            public void onFailure(Call<MessageJson> call, Throwable t) {
+//                System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!" + t);
+//            }
+//        });
+        changeButton.setOnClickListener(new View.OnClickListener() {
+        public void onClick(View v) {
+            Call<MessageJson> call = accountsFragment.changeIntroduction(uid,token,introductionEditText.getText().toString());
+            call.enqueue(new Callback<MessageJson>(){
+                @Override
+                public void onResponse(Call<MessageJson> call, Response<MessageJson> response) {
+                        MessageJson messageJson = response.body();
+                        Amaryllis app =(Amaryllis) getActivity().getApplication();
+                        app.setIntroduction(introductionEditText.getText().toString());
+                        Toast.makeText(getActivity(),
+                                "変更成功しました。", Toast.LENGTH_SHORT).show();
+                        System.out.println("RESPONSE!" );
+                }
+                @Override
+                public void onFailure(Call<MessageJson> call, Throwable t) {
+                    System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!" + t);
+                }
             });
-
+        }
+    });
+        String new_introduction;
+        new_introduction = app.getIntroduction();
+        introductionEditText.setText(new_introduction);
     }
 
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -98,4 +160,19 @@
 
         return inflater.inflate(R.layout.fragment_account, container, false);
     }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
index adc83b5..1a56d15 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
@@ -2,13 +2,17 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 
+import android.Manifest;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
@@ -35,24 +39,33 @@
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.Projection;
 import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.UiSettings;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.android.gms.maps.model.VisibleRegion;
 
 import org.ntlab.amaryllis.client.Amaryllis;
+import org.ntlab.amaryllis.client.LoginActivity;
 import org.ntlab.amaryllis.client.MainActivity;
 import org.ntlab.amaryllis.client.MyDialogFragment;
 import org.ntlab.amaryllis.client.R;
 import org.ntlab.amaryllis.client.VoiceActivity;
+import org.ntlab.amaryllis.client.entities.Category;
+import org.ntlab.amaryllis.client.entities.LoginJson;
 import org.ntlab.amaryllis.client.entities.SignUpJson;
 import org.ntlab.amaryllis.client.entities.Voicememo;
 import org.ntlab.amaryllis.client.resources.AccountsRest;
 import org.ntlab.amaryllis.client.resources.VoicememosRest;
+import org.ntlab.amaryllis.client.voiceservice.VoiceMemo;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.List;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -64,7 +77,7 @@
 import static android.content.Context.LOCATION_SERVICE;
 import static android.content.Context.MODE_PRIVATE;
 
-public class MapsFragment extends Fragment implements LocationListener,MyDialogFragment.DialogFragmentListener {
+public class MapsFragment extends Fragment implements LocationListener, MyDialogFragment.DialogFragmentListener {
 
 
     private MediaRecorder mr;
@@ -76,26 +89,74 @@
     private int StartChange = 1;
     private int SeekChange = 1;
     private int StopChange = 0;
+    private int count = 0;
     File file;
     static final String filePath = Environment.getExternalStorageDirectory() + "/sample.3gp";
     Button RecordButton;
     Button PlaybackButton;
-    private double latitude,longitude;
-//    double latitude,longitude;
-    private double latmax,latmin,longmax,longmin;
+    private double latitude, longitude;
+    //    double latitude,longitude;
+    private double latmax, latmin, longmax, longmin;
     private byte[] byteData = new byte[4096];
     //private short[] shortData = new short[2048];
     private int bufSize;
     LocationManager locationManager;
+    public MarkerOptions current_marker = null;
+    private ArrayList<String> category = new ArrayList<>();// onViewCreateに初期値を代入済み
+    private int before_category = 0;
+    private ArrayList<String> done_vid = new ArrayList<>();
+    private boolean flag = false;
+    private ArrayList<Marker> mMarker = new ArrayList<>();
 
+    public MapsFragment() {
+    }
 
+    /*
+    c02
+    c01
+    上記はすべてString
+    * */
     public final Application getApplication() {
         throw new RuntimeException("Stub!");
     }
+    public static int[] toRGB(String hexColorRGB) {
+        char[] rgb = hexColorRGB.toCharArray();
+        int[] rgbInt = new int[3];
+        rgbInt[0] = Character.digit(rgb[1], 16) * 16 + Character.digit(rgb[2], 16);
+        rgbInt[1] = Character.digit(rgb[3], 16) * 16 + Character.digit(rgb[4], 16);
+        rgbInt[2] = Character.digit(rgb[5], 16) * 16 + Character.digit(rgb[6], 16);
+        return rgbInt;
+    }
+
+    public static String toHexString(int r, int g, int b) {
+        StringBuffer buf = new StringBuffer();
+        if (r < 16) {
+            buf.append("0").append(Integer.toHexString(r));
+        } else {
+            buf.append(Integer.toHexString(r));
+        }
+        if (g < 16) {
+            buf.append("0").append(Integer.toHexString(g));
+        } else {
+            buf.append(Integer.toHexString(g));
+        }
+        if (b < 16) {
+            buf.append("0").append(Integer.toHexString(b));
+        } else {
+            buf.append(Integer.toHexString(b));
+        }
+        return buf.toString().toUpperCase();
+    }
+
+    public static String toHexString(int[] rgb) {
+        return toHexString(rgb[0], rgb[1], rgb[2]);
+    }
+
 
     private GoogleMap googlemap;
+    private Location location;
 
-    private OnMapReadyCallback callback = new OnMapReadyCallback() {
+    private final OnMapReadyCallback callback = new OnMapReadyCallback() {
         /**
          * Manipulates the map once available.
          * This callback is triggered when the map is ready to be used.
@@ -107,336 +168,409 @@
          */
 
         @Override
-        public void onMapReady(GoogleMap googleMap){
+        public void onMapReady(GoogleMap googleMap) {
 //            amaryllis =(Amaryllis)getApplication();
 //            String latitude = amaryllis.getLatitude();
 //            String longitude = amaryllis.getLongitude();
 //            double latitude1 = Double.parseDouble(latitude);
 //            double longitude1 = Double.parseDouble(longitude);
-
-
-
             MapsFragment.this.googlemap = googleMap;
-
+            // パーミッションの記述（これがないと現在地が表示できない）
+            if (ActivityCompat.checkSelfPermission(getContext(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                if (ActivityCompat.checkSelfPermission(getContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                    // TODO: Consider calling
+                    //    ActivityCompat#requestPermissions
+                    // here to request the missing permissions, and then overriding
+                    //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                    //                                          int[] grantResults)
+                    // to handle the case where the user grants the permission. See the documentation
+                    // for ActivityCompat#requestPermissions for more details.
+                    return;
+                }
+                // 現状、現在地ボタンが表示されてしまっている。UiSettings.setMyLocationButtonEnabled(false)を呼び出せばいいらしいがうまく動作しなかった
+            }
+            // TODO: パーミッションのif文にはいっていない（ビルドしたら解決する？？）
+            googleMap.setMyLocationEnabled(true);
         }
     };
+        private VoicememosRest voicememosService;
+        private Amaryllis amaryllis;
 
-    private VoicememosRest voicememosService;
-    private Amaryllis amaryllis;
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
+        @Nullable
+        @Override
+        public View onCreateView(@NonNull LayoutInflater inflater,
+                                 @Nullable ViewGroup container,
+                                 @Nullable Bundle savedInstanceState) {
 
-        return inflater.inflate(R.layout.fragment_maps, container, false);
+            return inflater.inflate(R.layout.fragment_maps, container, false);
 
-    }
-
-    //ここにボタンを押した時の処理を書いていきます。
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        ((MainActivity) getActivity()).subscribe(this);
-        Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
-                .addConverterFactory(JacksonConverterFactory.create())
-                .build();
-        voicememosService = retrofit.create(VoicememosRest.class);
-        amaryllis = (Amaryllis) getActivity().getApplication();
-        //file = new File(getFilesDir(),"Sample.3gp");
-        mp = new MediaPlayer();
-
-        RecordButton = (Button)view.findViewById(R.id.button);
-        RecordButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                //Intent intent = new Intent(getActivity(), VoiceActivity.class);
-                //startActivity(intent);
-                startRecord();
-            }
-        });
-
-        PlaybackButton = (Button)view.findViewById(R.id.button2);
-        PlaybackButton.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                startPlay();
-            }
-        });
-
-
-        SupportMapFragment mapFragment =
-                (SupportMapFragment) getChildFragmentManager().findFragmentById(R.id.map);
-        if (mapFragment != null) {
-            mapFragment.getMapAsync(callback);
         }
 
-        //ここはonCreateにあたる
+        //ここにボタンを押した時の処理を書いていきます。
+        @Override
+        public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+
+            ((MainActivity) getActivity()).subscribe(this);
+            Retrofit retrofit = new Retrofit.Builder()
+                    .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
+                    .addConverterFactory(JacksonConverterFactory.create())
+                    .build();
+            voicememosService = retrofit.create(VoicememosRest.class);
+//        amaryllis = (Amaryllis) getActivity().getApplication();
+//        file = new File(getFilesDir(),"Sample.3gp");
+            mp = new MediaPlayer();
+
+            RecordButton = (Button) view.findViewById(R.id.button);
+            RecordButton.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View v) {
+                    //Intent intent = new Intent(getActivity(), VoiceActivity.class);
+                    //startActivity(intent);
+                    startRecord();
+                }
+            });
+
+            PlaybackButton = (Button) view.findViewById(R.id.button2);
+            PlaybackButton.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View v) {
+                    startPlay();
+                }
+            });
+
+
+            SupportMapFragment mapFragment =
+                    (SupportMapFragment) getChildFragmentManager().findFragmentById(R.id.map);
+            if (mapFragment != null) {
+                mapFragment.getMapAsync(callback);
+            }
+
+            //ここはonCreateにあたる
 //            amaryllis =(Amaryllis)getApplication();
 //            String latitude = amaryllis.getLatitude();
 //            String longitude = amaryllis.getLongitude();
 //            latitude1 = Double.parseDouble(latitude);
 //            longitude1 = Double.parseDouble(longitude);
-    }
+            // ここでmainActivityにあるカテゴリーのArrayListをとってきて変数categoryに代入する
+        }
 
-    @Override
-    public void onLocationChanged(Location location) {
-        if(googlemap != null) {
-            Log.d("DEBUG", "lat : " + location.getLatitude());
-            Log.d("DEBUG", "lon : " + location.getLongitude());
-            LatLng sydney = new LatLng(location.getLatitude(), location.getLongitude());
-            MapsFragment.this.googlemap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
-            MapsFragment.this.googlemap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
-            Projection p = googlemap.getProjection();
-            VisibleRegion vr = p.getVisibleRegion();
-            latmax = vr.latLngBounds.northeast.latitude;
-            latmin = vr.latLngBounds.southwest.latitude;
-            longmax = vr.latLngBounds.northeast.longitude;
-            longmin = vr.latLngBounds.southwest.longitude;
-//            System.out.println(latmax + "!!!!!!!!!!!!!");
-//            System.out.println(latmin + "!!!!!!!!!!!!!");
-//            System.out.println(longmax + "!!!!!!!!!!!!!");
-//            System.out.println(longmin + "!!!!!!!!!!!!!");
-            Call<ArrayList<Voicememo>> call = voicememosService.getVoicememos(latmax, latmin, longmax, longmin);
-            call.enqueue(new Callback<ArrayList<Voicememo>>() {
-                @Override
-                public void onResponse(Call<ArrayList<Voicememo>> call, Response<ArrayList<Voicememo>> response) {
-
+        @Override
+        public void onLocationChanged(Location location) {
+            category = ((MainActivity) getActivity()).getCheckedCidList();
+            if(category.size() != before_category) {
+                for(Marker marker : mMarker) {
+                    marker.remove();
                 }
+                System.out.println(mMarker + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!11111111111111111111111111111111111111111111111111111111111");
+                done_vid = new ArrayList<>();
+                mMarker = new ArrayList<>();
+            }
+            before_category  = category.size();
+            LatLng current = new LatLng(location.getLatitude(), location.getLongitude());
+            if (googlemap != null) {
+                if (count == 0) {
+                    MapsFragment.this.googlemap.moveCamera(CameraUpdateFactory.newLatLngZoom(current, 15));
+                    count++;
+                } else {
+                    Projection p = googlemap.getProjection();
+                    VisibleRegion vr = p.getVisibleRegion();
+                    latmax = vr.latLngBounds.northeast.latitude;
+                    latmin = vr.latLngBounds.southwest.latitude;
+                    longmax = vr.latLngBounds.northeast.longitude;
+                    longmin = vr.latLngBounds.southwest.longitude;
+                    Call<List<VoiceMemo>> call = voicememosService.getVoicememos(latmax, latmin, longmax, longmin);
+                    call.enqueue(new Callback<List<VoiceMemo>>() {
+                        @Override
+                        public void onResponse(Call<List<VoiceMemo>> call, Response<List<VoiceMemo>> response) {
+                            List<VoiceMemo> voiceJson = response.body();
+                            for (VoiceMemo v : voiceJson) {
+                                LatLng voicememo = new LatLng(v.getLatitude(), v.getLongitude());
+                                for (String vid : done_vid) {
+                                    if (v.getVid().equals(vid)) {
+                                        flag = true;
+                                        break;
+                                    } else {
+                                        flag = false;
+                                    }
+                                }
+                                if (flag == false || done_vid.size() == 0) {
+                                    if (v.getCategory().size() >= 2) {
+                                        for (String category : category) {// ArrayList（ハンバーガーメニューでしていされた1つ以上のカテゴリーを比較する）
+                                            for (String cid : v.getCategory()) {
+                                                if (category.equals(cid)) {
+                                                    Marker m;
+                                                    m = MapsFragment.this.googlemap.addMarker(new MarkerOptions().position(voicememo).title(v.getTitle()).icon(BitmapDescriptorFactory.defaultMarker(300)));
+                                                    //m.remove();
+                                                    mMarker.add(m);
+                                                    //mMarker.add(MapsFragment.this.googlemap.addMarker(new MarkerOptions().position(voicememo).title(v.getTitle()).icon(BitmapDescriptorFactory.defaultMarker(300))));
+                                                    done_vid.add(v.getVid());
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    } else {
+                                        for (String category : category) {// ArrayList（ハンバーガーメニューでしていされた1つ以上のカテゴリーを比較する）
+                                            for (String cid : v.getCategory()) {
+                                                Category category_info = ((MainActivity) getActivity()).getCategory(cid);
+                                                if (category.equals(cid)) {
+                                                    float[] i = new float[3];
+                                                    int[] rgb = toRGB(category_info.getColor());
+                                                    Color.RGBToHSV(rgb[0], rgb[1], rgb[2], i);
+                                                    //MarkerOptions marker = ;
 
+                                                    Marker m;
+                                                    m = MapsFragment.this.googlemap.addMarker(new MarkerOptions().position(voicememo).title(v.getTitle()).icon(BitmapDescriptorFactory.defaultMarker(i[0])));
+                                                    mMarker.add(m);
+                                                    //mMarker.add(MapsFragment.this.googlemap.addMarker(new MarkerOptions().position(voicememo).title(category_info.getName()).icon(BitmapDescriptorFactory.defaultMarker(i[0]))));
+                                                    done_vid.add(v.getVid());
+                                                }
+                                            }
+
+                                        }
+                                    }
+
+                                }
+                            }
+                        }
+                        @Override
+                        public void onFailure(Call<List<VoiceMemo>> call, Throwable t) {
+                        }
+                    });
+                }
+            }
+
+        }
+
+        @Override
+        public void onStatusChanged(String s, int i, Bundle bundle) {
+
+        }
+
+        @Override
+        public void onProviderEnabled(String s) {
+
+        }
+
+        @Override
+        public void onProviderDisabled(String s) {
+
+        }
+
+
+        @Override
+        public void onDialogPositiveButtonClicked() {
+
+        }
+
+        @Override
+        public void onOkClicked(Bundle args) {
+
+        }
+
+
+        public class FragmentTest extends Fragment implements View.OnClickListener {
+
+            @Override
+            public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+                // 第３引数のbooleanは"container"にreturnするViewを追加するかどうか
+                //trueにすると最終的なlayoutに再度、同じView groupが表示されてしまうのでfalseでOKらしい
+                View v = inflater.inflate(R.layout.fragment_maps, container, false);
+
+                // ボタンを取得して、ClickListenerをセット
+                Button btn = (Button) v.findViewById(R.id.button);
+                btn.setOnClickListener(this);
+                return v;
+            }
+
+            @Override
+            public void onClick(View v) {
+                // TODO 自動生成されたメソッド・スタブ
+                System.out.println("!!!");
+            }
+
+        }
+
+        //録音開始&録音終了
+        private void startRecord() {
+            File wavFile = new File(filePath);
+            final ImageView R_Stoping = getView().findViewById(R.id.R_Stoping);
+            final ImageView R_Playing = getView().findViewById(R.id.R_Playing);
+            if (StartChange == 0) {
+                try {
+                    FileInputStream in = new FileInputStream(filePath); // ファイル読み込み用
+
+                    TextView textView1 = (TextView) getView().findViewById(R.id.Notice);
+                    textView1.setText("Record End!");
+                    mr.stop();
+                    mr.reset();
+                    mr.release();
+
+
+                    DialogFragment dialog = new MyDialogFragment();
+                    dialog.setTargetFragment(MapsFragment.this, 0); // ★★★
+                    dialog.show(getParentFragmentManager(), "Dialog");
+
+
+                    in.read(byteData);
+                    String data = Base64.encodeToString(byteData, 0, byteData.length, Base64.DEFAULT);
+
+
+//                Call<Voicememo> call = voicememosService.postVoicememos(amaryllis.getUid(),amaryllis.getToken(),10,data,35,135,"untitled","");
+//                call.enqueue(new Callback<Voicememo>() {
+//                     @Override
+//                     public void onResponse(Call<Voicememo> call, Response<Voicememo> response) {
+//                        Voicememo voicememo = response.body();
+//                     }
+//
+//                    @Override
+//                    public void onFailure(Call<Voicememo> call, Throwable t) {
+//
+//                    }
+//                });
+                    StartChange = 1;
+                    R_Stoping.setAlpha(1.0f);
+                    R_Playing.setAlpha(0.0f);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                try {
+                    TextView textView1 = (TextView) getView().findViewById(R.id.Notice);
+                    textView1.setText("Record Start!");
+                    mr = new MediaRecorder();
+                    mr.setAudioSource(MediaRecorder.AudioSource.MIC);
+                    mr.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+                    mr.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+                    //mr.setOutputFile(file.getAbsolutePath());
+                    mr.setOutputFile(filePath);
+
+                    mr.prepare();
+                    mr.start();
+                    StartChange = 0;
+                    R_Stoping.setAlpha(0.0f);
+                    R_Playing.setAlpha(1.0f);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+
+        //再生開始&再生中止
+        //次は再生が終わった時の処理を書いていく事。
+        private void startPlay() {
+            final ImageView Stoping = getView().findViewById(R.id.Stoping);
+            final ImageView Playing = getView().findViewById(R.id.Playing);
+            float Tmin = 0;
+            float Tmax = 255;
+            //mp = new MediaPlayer();
+            //mp = MediaPlayer.create(this,R.raw.bgm);
+
+            if (mp.isPlaying()) {
+                TextView textView1 = (TextView) getView().findViewById(R.id.Notice);
+                textView1.setText("Playback Stop!");
+                //mp.stop();//再生を中断
+                mp.pause();//途中から再生を再開したい時はこっちを使う必要があるかも
+                SeekChange = 0;
+
+                Stoping.setAlpha(1.0f);//画像が見えるようにする処理
+                Playing.setAlpha(0.0f);//画像が見えないようにする処理
+
+
+                //try{
+                //mp.prepare();
+                //}catch(IllegalStateException e){
+                //e.printStackTrace();
+                //}catch(IOException e){
+                //e.printStackTrace();
+                //}
+            } else {
+                try {
+                    //mp = new MediaPlayer();
+                    //mp.setDataSource(file.getAbsolutePath());//再生するファイルを持ってくる
+
+
+                    //OutputStream filePath = openFileOutput("a",MODE_PRIVATE);
+                    mp.setDataSource(filePath);
+                    mp.prepare();
+                } catch (IllegalStateException e) {
+                    e.printStackTrace();
+
+                    //if(StartChange == 1){
+                    //positionBar = findViewById(R.id.positionBar);
+                    //positionBar.setMax(totalTime);
+                    //positionBar.setOnSeekBarChangeListener(
+                    //new SeekBar.OnSeekBarChangeListener(){
+                    //public void onProgressChanged(SeekBar seekBar,int progress,boolean fromUser){
+                    //if(fromUser){
+                    //mp.seekTo(progress);
+                    //positionBar.setProgress(progress);
+                    //}
+                    //}
+
+                    //public void onStartTrackingTouch(SeekBar seekBar){
+
+                    //}
+
+                    //public void onStopTrackingTouch(SeekBar seekBar){
+
+                    //}
+                    //}
+                    //);
+
+                    //}
+
+                    //mp.start();
+
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                TextView textView1 = (TextView) getView().findViewById(R.id.Notice);
+                textView1.setText("Playback Start!");
+                if (SeekChange == 1) {
+                    mp.seekTo(0);
+                }
+                mp.start();//再生スタート
+                Playing.setAlpha(1.0f);
+                Stoping.setAlpha(0.0f);
+            }
+            totalTime = mp.getDuration();
+            String S_totalTime = createTimeLabel(totalTime);//createTimeLabelにtotalTimeを渡す。
+            TextView voiceTime = (TextView) getView().findViewById(R.id.VoiceTime);
+            voiceTime.setText(S_totalTime);
+
+            // 再生した音声の終了を検知する
+            //implements  MediaPlayer.OnCompletionListener {
+            mp.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
                 @Override
-                public void onFailure(Call<ArrayList<Voicememo>> call, Throwable t) {
-
+                public void onCompletion(MediaPlayer mp) {
+                    //Log.d("debug","end of audio");
+                    TextView textView1 = (TextView) getView().findViewById(R.id.Notice);
+                    textView1.setText("Playback End!");
+                    Stoping.setAlpha(1.0f);
+                    Playing.setAlpha(0.0f);
+                    mp.stop();
+                    //mp.release();
+                    mp.reset();
+                    SeekChange = 1;
+                    //audioStop();
                 }
             });
         }
 
-    }
+        //totalTimeを分、秒に変換
+        public String createTimeLabel(int time) {
+            String timeLabel = "";
+            int min = time / 1000 / 60;
+            int sec = time / 1000 % 60;
 
-    @Override
-    public void onStatusChanged(String s, int i, Bundle bundle) {
-
-    }
-
-    @Override
-    public void onProviderEnabled(String s) {
-
-    }
-
-    @Override
-    public void onProviderDisabled(String s) {
-
-    }
-
-
-    @Override
-    public void onDialogPositiveButtonClicked() {
-
-    }
-
-    @Override
-    public void onOkClicked(Bundle args) {
-
-    }
-
-
-    public class FragmentTest extends Fragment implements View.OnClickListener {
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
-            // 第３引数のbooleanは"container"にreturnするViewを追加するかどうか
-            //trueにすると最終的なlayoutに再度、同じView groupが表示されてしまうのでfalseでOKらしい
-            View v = inflater.inflate(R.layout.fragment_maps, container, false);
-
-            // ボタンを取得して、ClickListenerをセット
-            Button btn = (Button)v.findViewById(R.id.button);
-            btn.setOnClickListener(this);
-            return v;
-        }
-
-        @Override
-        public void onClick(View v) {
-            // TODO 自動生成されたメソッド・スタブ
-            System.out.println("!!!");
+            timeLabel = min + ":";
+            if (sec < 10) timeLabel += "0";
+            timeLabel += sec;
+            return timeLabel;
         }
 
     }
 
-    //録音開始&録音終了
-    private void startRecord(){
-        File wavFile = new File(filePath);
-        final ImageView R_Stoping = getView().findViewById(R.id.R_Stoping);
-        final ImageView R_Playing = getView().findViewById(R.id.R_Playing);
-        if(StartChange == 0) {
-            try {
-                FileInputStream in = new FileInputStream(filePath); // ファイル読み込み用
-
-                TextView textView1 = (TextView)getView().findViewById(R.id.Notice);
-                textView1.setText("Record End!");
-                mr.stop();
-                mr.reset();
-                mr.release();
-
-
-                DialogFragment dialog = new MyDialogFragment();
-                dialog.setTargetFragment(MapsFragment.this, 0); // ★★★
-                dialog.show(getParentFragmentManager(), "Dialog");
-
-
-
-
-
-
-                in.read(byteData);
-                String data = Base64.encodeToString(byteData, 0,byteData.length, Base64.DEFAULT);
-                //voice = data;
-
-                amaryllis.setData(data);
-
-                StartChange = 1;
-                R_Stoping.setAlpha(1.0f);
-                R_Playing.setAlpha(0.0f);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }else {
-            try {
-                TextView textView1 = (TextView)getView().findViewById(R.id.Notice);
-                textView1.setText("Record Start!");
-                mr = new MediaRecorder();
-                mr.setAudioSource(MediaRecorder.AudioSource.MIC);
-                mr.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
-                mr.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
-                //mr.setOutputFile(file.getAbsolutePath());
-                mr.setOutputFile(filePath);
-
-                mr.prepare();
-                mr.start();
-                StartChange = 0;
-                R_Stoping.setAlpha(0.0f);
-                R_Playing.setAlpha(1.0f);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-
-    //再生開始&再生中止
-    //次は再生が終わった時の処理を書いていく事。
-    private void startPlay(){
-        final ImageView Stoping = getView().findViewById(R.id.Stoping);
-        final ImageView Playing = getView().findViewById(R.id.Playing);
-        float Tmin = 0;
-        float Tmax = 255;
-        //mp = new MediaPlayer();
-        //mp = MediaPlayer.create(this,R.raw.bgm);
-
-        if(mp.isPlaying()){
-            TextView textView1 = (TextView)getView().findViewById(R.id.Notice);
-            textView1.setText("Playback Stop!");
-            //mp.stop();//再生を中断
-            mp.pause();//途中から再生を再開したい時はこっちを使う必要があるかも
-            SeekChange = 0;
-
-            Stoping.setAlpha(1.0f);//画像が見えるようにする処理
-            Playing.setAlpha(0.0f);//画像が見えないようにする処理
-
-
-            //try{
-            //mp.prepare();
-            //}catch(IllegalStateException e){
-            //e.printStackTrace();
-            //}catch(IOException e){
-            //e.printStackTrace();
-            //}
-        }else {
-            try {
-                //mp = new MediaPlayer();
-                //mp.setDataSource(file.getAbsolutePath());//再生するファイルを持ってくる
-
-
-                //OutputStream filePath = openFileOutput("a",MODE_PRIVATE);
-                mp.setDataSource(filePath);
-                mp.prepare();
-            }catch(IllegalStateException e){
-                e.printStackTrace();
-
-                //if(StartChange == 1){
-                //positionBar = findViewById(R.id.positionBar);
-                //positionBar.setMax(totalTime);
-                //positionBar.setOnSeekBarChangeListener(
-                //new SeekBar.OnSeekBarChangeListener(){
-                //public void onProgressChanged(SeekBar seekBar,int progress,boolean fromUser){
-                //if(fromUser){
-                //mp.seekTo(progress);
-                //positionBar.setProgress(progress);
-                //}
-                //}
-
-                //public void onStartTrackingTouch(SeekBar seekBar){
-
-                //}
-
-                //public void onStopTrackingTouch(SeekBar seekBar){
-
-                //}
-                //}
-                //);
-
-                //}
-
-                //mp.start();
-
-
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            TextView textView1 = (TextView)getView().findViewById(R.id.Notice);
-            textView1.setText("Playback Start!");
-            if(SeekChange == 1) {
-                mp.seekTo(0);
-            }
-            mp.start();//再生スタート
-            Playing.setAlpha(1.0f);
-            Stoping.setAlpha(0.0f);
-        }
-        totalTime = mp.getDuration();
-        String S_totalTime = createTimeLabel(totalTime);//createTimeLabelにtotalTimeを渡す。
-        TextView voiceTime = (TextView)getView().findViewById(R.id.VoiceTime);
-        voiceTime.setText(S_totalTime);
-
-        // 再生した音声の終了を検知する
-        //implements  MediaPlayer.OnCompletionListener {
-        mp.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
-            @Override
-            public void onCompletion(MediaPlayer mp) {
-                //Log.d("debug","end of audio");
-                TextView textView1 = (TextView)getView().findViewById(R.id.Notice);
-                textView1.setText("Playback End!");
-                Stoping.setAlpha(1.0f);
-                Playing.setAlpha(0.0f);
-                mp.stop();
-                //mp.release();
-                mp.reset();
-                SeekChange = 1;
-                //audioStop();
-            }
-        });
-    }
-
-    //totalTimeを分、秒に変換
-    public String createTimeLabel(int time){
-        String timeLabel = "";
-        int min = time/1000/60;
-        int sec = time/1000%60;
-
-        timeLabel = min + ":";
-        if(sec < 10) timeLabel += "0";
-        timeLabel += sec;
-        return timeLabel;
-    }
-
-}
-
 
 
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java
index 1a549cb..1a4e1ef 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java
@@ -17,7 +17,7 @@
 import org.ntlab.amaryllis.client.entities.PostFollowersResponse;
 import org.ntlab.amaryllis.client.entities.PostFollowingsResponse;
 import org.ntlab.amaryllis.client.entities.PostHistoryResponse;
-import org.ntlab.amaryllis.client.entities.PutIntroductionResponse;
+import org.ntlab.amaryllis.client.entities.MessageJson;
 import org.ntlab.amaryllis.client.entities.PutPasswordResponse;
 import org.ntlab.amaryllis.client.entities.SignUpJson;
 
@@ -52,7 +52,7 @@
     //アカウントのログイン
     @FormUrlEncoded
     @PUT("accounts")
-    Call<LoginJson> putAccounts(
+    Call<SignUpJson> putAccounts(
             @Field("name") String name,
             @Field("password") String password
     );
@@ -161,12 +161,12 @@
     );
 
     //自己紹介の修正
+    @FormUrlEncoded
     @PUT("accounts/{uid}/introduction")
-    Call<PutIntroductionResponse> putIntroduction(
-            @Path("uId") String uId,
-            @Field("password") String password,
-            @Field("new_introduction") String new_introduction,
-            @Field("message") String message
+    Call<MessageJson> changeIntroduction(
+            @Path("uid") String uid,
+            @Field("token") String token,
+            @Field("new_introduction") String newIntroduction
     );
 
     //ボイスメモの視聴履歴
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java
index 5f26a14..debc564 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/CategoriesRest.java
@@ -3,6 +3,7 @@
 import org.ntlab.amaryllis.client.entities.Category;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import retrofit2.Call;
 import retrofit2.http.GET;
@@ -12,7 +13,7 @@
 public interface CategoriesRest {
     //すべてのcidを取得
     @GET("categories")
-    Call<ArrayList<Category>> getcategories();
+    Call<List<Category>> getcategories();
 
     //指定したカテゴリを取得
     @GET("categories/{cid}")
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java
index 7f44b82..9ddd31e 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java
@@ -1,15 +1,15 @@
 package org.ntlab.amaryllis.client.resources;
 
 
-import android.widget.TextView;
-
 import org.ntlab.amaryllis.client.entities.Voicememo;
 import org.ntlab.amaryllis.client.entities.VoicememosEditFixResponse;
 import org.ntlab.amaryllis.client.entities.VoicememosFavosDeleteResponse;
 import org.ntlab.amaryllis.client.entities.VoicememosFavosResponse;
 import org.ntlab.amaryllis.client.entities.VoicememostimesResponse;
+import org.ntlab.amaryllis.client.voiceservice.VoiceMemo;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import retrofit2.Call;
 import retrofit2.http.DELETE;
@@ -24,7 +24,7 @@
 public interface VoicememosRest {
     //全てのvidを取得
     @GET("voicememos")
-    Call<ArrayList<Voicememo>> getVoicememos(
+    Call<List<VoiceMemo>> getVoicememos(
             @Query("latmax") Double latmax,
             @Query("latmin") Double latmin,
             @Query("longmax") Double longmax,
@@ -43,7 +43,7 @@
             @Field("longitude") double longitude,
             @Field("title") String title,
             @Field("summary") String summary,
-            @Field("category") ArrayList<String> category
+            @Field("categories") List<String> categories
     );
 
     //指定された投稿の情報を取得
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/MusicService.java b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/MusicService.java
new file mode 100644
index 0000000..ca097fd
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/MusicService.java
@@ -0,0 +1,371 @@
+package org.ntlab.amaryllis.client.voiceservice;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.media.MediaBrowserCompat;
+import android.support.v4.media.MediaDescriptionCompat;
+import android.support.v4.media.MediaMetadataCompat;
+import android.support.v4.media.session.MediaControllerCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.support.v4.media.session.PlaybackStateCompat;
+import android.util.Log;
+import android.view.KeyEvent;
+
+import org.ntlab.amaryllis.client.R;
+import org.ntlab.amaryllis.client.TestPlayActivity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+import androidx.media.MediaBrowserServiceCompat;
+import androidx.media.session.MediaButtonReceiver;
+
+public class MusicService extends MediaBrowserServiceCompat {
+    final String TAG = MusicService.class.getSimpleName();//ログ用タグ
+    final String ROOT_ID = "root";//クライアントに返すID onGetRoot / onLoadChildrenで使用
+
+    Handler handler;//定期的に処理を回すためのHandler
+
+    MediaSessionCompat mSession;//主役のMediaSession
+    AudioManager am;//AudioFoucsを扱うためのManager
+    MediaPlayer mediaPlayer;
+
+    int index = 0;//再生中のインデックス
+    List<MediaSessionCompat.QueueItem> queueItems = new ArrayList<>();//キューに使用するリスト
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        //AudioManagerを取得
+        am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+        //MediaSessionを初期化
+        mSession = new MediaSessionCompat(getApplicationContext(), TAG);
+        //このMediaSessionが提供する機能を設定
+        mSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS | //ヘッドフォン等のボタンを扱う
+                MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS | //キュー系のコマンドの使用をサポート
+                MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS); //再生、停止、スキップ等のコントロールを提供
+
+        //クライアントからの操作に応じるコールバックを設定
+        mSession.setCallback(callback);
+
+        //MediaBrowserServiceにSessionTokenを設定
+        //setSessionToken(mSession.getSessionToken());//停止の原因
+
+        //Media Sessionのメタデータや、プレイヤーのステータスが更新されたタイミングで
+        //通知の作成/更新をする
+        mSession.getController().registerCallback(new MediaControllerCompat.Callback() {
+            @Override
+            public void onPlaybackStateChanged(PlaybackStateCompat state) {
+                CreateNotification();
+            }
+
+            @Override
+            public void onMetadataChanged(MediaMetadataCompat metadata) {
+                CreateNotification();
+            }
+        });
+     //   CreateNotification();
+
+        //キューにアイテムを追加
+        int i = 0;
+//        for (MediaBrowserCompat.MediaItem media : MusicLibrary.getMediaItems()) {
+//            queueItems.add(new MediaSessionCompat.QueueItem(media.getDescription(), i));
+//            i++;
+//        }
+        //mSession.setQueue(queueItems);//WearやAutoにキューが表示される
+
+        mediaPlayer =new MediaPlayer();
+        handler = new Handler();
+        //500msごとに再生情報を更新
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                //再生中にアップデート
+
+                //再度実行
+                handler.postDelayed(this, 500);
+            }
+        }, 500);
+    }
+
+    //クライアント接続時に呼び出される
+    //パッケージ名などから接続するかどうかを決定する
+    //任意の文字列を返すと接続許可
+    //nullで接続拒否
+    //今回は全ての接続を許可
+    @Override
+    public BrowserRoot onGetRoot(@NonNull String clientPackageName,
+                                 int clientUid,
+                                 Bundle rootHints) {
+        Log.d(TAG, "Connected from pkg:" + clientPackageName + " uid:" + clientUid);
+
+        return new BrowserRoot(ROOT_ID, null);
+    }
+
+    //クライアント側がsubscribeを呼び出すと呼び出される
+    //音楽ライブラリの内容を返す
+    //WearやAutoで表示される曲のリストにも使われる
+    //デフォルトでonGetRootで返した文字列がparentMediaIdに渡される
+    //ブラウザ画面で子要素を持っているMediaItemを選択した際にもそのIdが渡される
+    @Override
+    public void onLoadChildren(
+            @NonNull final String parentMediaId,
+            @NonNull final Result<List<MediaBrowserCompat.MediaItem>> result) {
+
+        if (parentMediaId.equals(ROOT_ID));
+            //曲のリストをクライアントに送信
+
+        else//今回はROOT_ID以外は無効
+            result.sendResult(new ArrayList<MediaBrowserCompat.MediaItem>());
+    }
+    @Override
+    public void onDestroy() {
+        Log.d(TAG, "onDestroy");
+        mSession.setActive(false);
+        mSession.release();
+       mediaPlayer.stop();
+        mediaPlayer.release();
+    }
+
+
+    //MediaSession用コールバック
+    private MediaSessionCompat.Callback callback = new MediaSessionCompat.Callback() {
+
+        //曲のIDから再生する
+        //WearやAutoのブラウジング画面から曲が選択された場合もここが呼ばれる
+        @Override
+        public void onPlayFromMediaId(String mediaId, Bundle extras) {
+            //今回はAssetsフォルダに含まれる音声ファイルを再生
+            //Uriから再生する
+           // DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), Util.getUserAgent(getApplicationContext(), "AppName"));
+            //MediaSource mediaSource = new ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(Uri.parse("file:///android_asset/" + MusicLibrary.getMusicFilename(mediaId)));
+
+
+
+          // mediaPlayer.prepare();
+
+            mSession.setActive(true);
+
+            onPlay();
+
+            //MediaSessionが配信する、再生中の曲の情報を設定
+          //  mSession.setMetadata(MusicLibrary.getMetadata(getApplicationContext(), mediaId));
+        }
+
+        //再生をリクエストされたとき
+        @Override
+        public void onPlay() {
+            //オーディオフォーカスを要求
+//            if (am.requestAudioFocus(afChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+//                //取得できたら再生を始める
+//                mSession.setActive(true);
+//                exoPlayer.setPlayWhenReady(true);
+//            }
+        }
+
+        //一時停止をリクエストされたとき
+        @Override
+        public void onPause() {
+       //     exoPlayer.setPlayWhenReady(false);
+            //オーディオフォーカスを開放
+           // am.abandonAudioFocus(afChangeListener);
+        }
+
+        //停止をリクエストされたとき
+        @Override
+        public void onStop() {
+            onPause();
+            mSession.setActive(false);
+            //オーディオフォーカスを開放
+            //am.abandonAudioFocus(afChangeListener);
+        }
+
+        //シークをリクエストされたとき
+        @Override
+        public void onSeekTo(long pos) {
+           //mediaPlayer.seekTo(pos);
+        }
+
+        //次の曲をリクエストされたとき
+        @Override
+        public void onSkipToNext() {
+            index++;
+            if (index >= queueItems.size())//ライブラリの最後まで再生したら
+                index = 0;//最初に戻す
+
+            onPlayFromMediaId(queueItems.get(index).getDescription().getMediaId(), null);
+        }
+
+        //前の曲をリクエストされたとき
+        @Override
+        public void onSkipToPrevious() {
+            index--;
+            if (index < 0)//インデックスが0以下になったら
+                index = queueItems.size() - 1;//最後の曲に移動する
+
+            onPlayFromMediaId(queueItems.get(index).getDescription().getMediaId(), null);
+        }
+
+        //WearやAutoでキュー内のアイテムを選択された際にも呼び出される
+        @Override
+        public void onSkipToQueueItem(long i) {
+            onPlayFromMediaId(queueItems.get((int)i).getDescription().getMediaId(), null);
+        }
+
+        //Media Button Intentが飛んできた時に呼び出される
+        //オーバーライド不要（今回はログを吐くだけ）
+        //MediaSessionのplaybackStateのActionフラグに応じてできる操作が変わる
+        @Override
+        public boolean onMediaButtonEvent(Intent mediaButtonEvent) {
+            KeyEvent key = mediaButtonEvent.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
+            Log.d(TAG, String.valueOf(key.getKeyCode()));
+            return super.onMediaButtonEvent(mediaButtonEvent);
+        }
+    };
+
+
+
+    //MediaSessionが配信する、現在のプレイヤーの状態を設定する
+    //ここには再生位置の情報も含まれるので定期的に更新する
+    private void UpdatePlaybackState() {
+//        int state = PlaybackStateCompat.STATE_NONE;
+//        //プレイヤーの状態からふさわしいMediaSessionのステータスを設定する
+//        switch (exoPlayer.getPlaybackState()) {
+//            case Player.STATE_IDLE:
+//                state = PlaybackStateCompat.STATE_NONE;
+//                break;
+//            case Player.STATE_BUFFERING:
+//                state = PlaybackStateCompat.STATE_BUFFERING;
+//                break;
+//            case Player.STATE_READY:
+//                if (exoPlayer.getPlayWhenReady())
+//                    state = PlaybackStateCompat.STATE_PLAYING;
+//                else
+//                    state = PlaybackStateCompat.STATE_PAUSED;
+//                break;
+//            case Player.STATE_ENDED:
+//                state = PlaybackStateCompat.STATE_STOPPED;
+//                break;
+//        }
+//
+//        //プレイヤーの情報、現在の再生位置などを設定する
+//        //また、MeidaButtonIntentでできる操作を設定する
+//        mSession.setPlaybackState(new PlaybackStateCompat.Builder()
+//                .setActions(PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PAUSE | PlaybackStateCompat.ACTION_SKIP_TO_NEXT | PlaybackStateCompat.ACTION_STOP)
+//                .setState(state, exoPlayer.getCurrentPosition(), exoPlayer.getPlaybackParameters().speed)
+//                .build());
+    }
+    //通知を作成、サービスをForegroundにする
+    private void CreateNotification() {
+        MediaControllerCompat controller = mSession.getController();
+        MediaMetadataCompat mediaMetadata = controller.getMetadata();
+
+        if (mediaMetadata == null && !mSession.isActive()) return;
+
+        MediaDescriptionCompat description = mediaMetadata.getDescription();
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext());
+
+        builder
+                //現在の曲の情報を設定
+                .setContentTitle(description.getTitle())
+                .setContentText(description.getSubtitle())
+                .setSubText(description.getDescription())
+                .setLargeIcon(description.getIconBitmap())
+
+                // 通知をクリックしたときのインテントを設定
+                .setContentIntent(createContentIntent())
+
+                // 通知がスワイプして消された際のインテントを設定
+                .setDeleteIntent(MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+                        PlaybackStateCompat.ACTION_STOP))
+
+                // 通知の範囲をpublicにしてロック画面に表示されるようにする
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+
+                .setSmallIcon(R.drawable.ic_baseline_play_circle_outline_24)
+                //通知の領域に使う色を設定
+                //Androidのバージョンによってスタイルが変わり、色が適用されない場合も多い
+                .setColor(ContextCompat.getColor(this, R.color.colorAccent))
+
+                // Media Styleを利用する
+                .setStyle(new androidx.media.app.NotificationCompat.MediaStyle()
+                        .setMediaSession(mSession.getSessionToken())
+                        //通知を小さくたたんだ時に表示されるコントロールのインデックスを設定
+                        .setShowActionsInCompactView(1));
+
+        // Android4.4以前は通知をスワイプで消せないので
+        //キャンセルボタンを表示することで対処
+        //今回はminSDKが21なので必要ない
+        //.setShowCancelButton(true)
+        //.setCancelButtonIntent(MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+        //        PlaybackStateCompat.ACTION_STOP)));
+
+        //通知のコントロールの設定
+//        builder.addAction(new NotificationCompat.Action(
+//                R.drawable.exo_controls_previous, "prev",
+//                MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+//                        PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS)));
+
+        //プレイヤーの状態で再生、一時停止のボタンを設定
+        if (controller.getPlaybackState().getState() == PlaybackStateCompat.STATE_PLAYING) {
+            builder.addAction(new NotificationCompat.Action(
+                    R.drawable.ic_baseline_pause_circle_outline_24, "pause",
+                    MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+                            PlaybackStateCompat.ACTION_PAUSE)));
+        } else {
+            builder.addAction(new NotificationCompat.Action(
+                    R.drawable.ic_baseline_play_circle_outline_24, "play",
+                    MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+                            PlaybackStateCompat.ACTION_PLAY)));
+        }
+
+
+//        builder.addAction(new NotificationCompat.Action(
+//                R.drawable.exo_controls_next, "next",
+//                MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+//                        PlaybackStateCompat.ACTION_SKIP_TO_NEXT)));
+
+        startForeground(1, builder.build());
+
+        //再生中以外ではスワイプで通知を消せるようにする
+        if (controller.getPlaybackState().getState() != PlaybackStateCompat.STATE_PLAYING)
+            stopForeground(false);
+    }
+
+    //通知をクリックしてActivityを開くインテントを作成
+    private PendingIntent createContentIntent() {
+        Intent openUI = new Intent(this, TestPlayActivity.class);
+        openUI.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        return PendingIntent.getActivity(
+                this, 1, openUI, PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    //オーディオフォーカスのコールバック
+    AudioManager.OnAudioFocusChangeListener afChangeListener =
+            new AudioManager.OnAudioFocusChangeListener() {
+                public void onAudioFocusChange(int focusChange) {
+                    //フォーカスを完全に失ったら
+                    if (focusChange == AudioManager.AUDIOFOCUS_LOSS) {
+                        //止める
+                        mSession.getController().getTransportControls().pause();
+                    } else if (focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT) {//一時的なフォーカスロスト
+                        //止める
+                        mSession.getController().getTransportControls().pause();
+                    } else if (focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) {//通知音とかによるフォーカスロスト（ボリュームを下げて再生し続けるべき）
+                        //本来なら音量を一時的に下げるべきだが何もしない
+                    } else if (focusChange == AudioManager.AUDIOFOCUS_GAIN) {//フォーカスを再度得た場合
+                        //再生
+                        mSession.getController().getTransportControls().play();
+                    }
+                }
+            };
+}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java
new file mode 100644
index 0000000..95957b0
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java
@@ -0,0 +1,60 @@
+package org.ntlab.amaryllis.client.voiceservice;
+
+import java.util.ArrayList;
+
+public class PlayListManager{
+    int index = 0;
+    ArrayList<VoiceMemo> playlist = new ArrayList<>();
+    //範囲内にある全てのvoicememoのリストを作成
+    public void addVoiceMemos(ArrayList<VoiceMemo> voicememos){
+        for(int i = 0;i < voicememos.size(); i++) {
+            boolean exist = false;
+            for(int j = 0;j < playlist.size(); j++){
+                if(voicememos.get(i).getVid().equals(playlist.get(j).getVid()))
+                  exist = true;
+            }
+            if(exist = false)
+              playlist.add(voicememos.get(i));
+        }
+    }
+
+    //範囲内にある全てのvoicememoのリスト
+    public ArrayList<VoiceMemo> getPlayList(){
+        return playlist;
+    }
+
+    //次に聞くvoicememoを渡す
+    public ArrayList<VoiceMemo> getUnplayedList(){
+        ArrayList<VoiceMemo> unplayedlist = new ArrayList<>();
+        if (index != 0){
+            index++;
+        }
+        unplayedlist.add(playlist.get(index));
+//        for(int i = 0;i < unplayedlist.size(); i++) {
+//            boolean exist = false;
+//            for(int j= index;j < playlist.size(); j++){
+//                if(playlist.get(j).getVid().equals(unplayedlist.get(i).getVid()))
+//                    exist = true;
+//            }
+//            if(exist = false)
+//                playlist.add(unplayedlist.get(i));
+//        }
+//        for(int i = index; i < playlist.size(); i++){
+//            unplayedlist.add(playlist.get(i));
+//        }
+        return unplayedlist;
+    }
+
+    //次のvoicememoに移動する
+    public void next() {
+        index++;
+    }
+
+    public void setIndex(){
+        this.index = index;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/TestVoiceService.java b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/TestVoiceService.java
new file mode 100644
index 0000000..236851c
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/TestVoiceService.java
@@ -0,0 +1,455 @@
+package org.ntlab.amaryllis.client.voiceservice;
+
+import android.annotation.SuppressLint;
+import android.app.IntentService;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.BitmapFactory;
+import android.media.AudioManager;
+import android.media.MediaMetadataRetriever;
+import android.media.MediaPlayer;
+import android.media.MediaSession2Service;
+import android.media.RemoteControlClient;
+import android.media.RemoteController;
+import android.media.browse.MediaBrowser;
+import android.media.session.MediaSession;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.service.media.MediaBrowserService;
+
+import android.support.v4.media.MediaDescriptionCompat;
+import android.support.v4.media.MediaMetadataCompat;
+import android.support.v4.media.session.MediaControllerCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.support.v4.media.session.PlaybackStateCompat;
+import android.util.Log;
+import android.view.KeyEvent;
+
+
+import org.ntlab.amaryllis.client.R;
+import org.ntlab.amaryllis.client.TestPlayActivity;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.ContextCompat;
+import androidx.media.MediaBrowserServiceCompat;
+import androidx.media.session.MediaButtonReceiver;
+
+
+public class TestVoiceService extends IntentService implements MediaPlayer.OnPreparedListener{
+    final String TAG = TestVoiceService.class.getSimpleName();//ログ用タグ
+    final String ROOT_ID = "root";//クライアントに返すID onGetRoot / onLoadChildrenで使用
+
+    public static final String ACTION_TOGGLE = "org.ntlab.amaryllis.client.voiceservice.ACTION_TOGGLE";
+    public static final String ACTION_PLAY = "org.ntlab.amaryllis.client.voiceservice.ACTION_PLAY";
+
+
+
+
+    private PlayListManager playListManager;
+    MediaPlayer mediaPlayer;
+    AudioManager audioManager;
+    MediaSessionCompat mediaSession;
+    ComponentName sampleReceiver;
+
+    enum State{PLAY,STOP,PAUSE};
+    State mState=State.STOP;
+
+
+    int index = 0;//再生中のインデックス
+    final IBinder myBinder=new MyBinder();
+    public class MyBinder extends Binder {
+        public TestVoiceService getService(){
+            return TestVoiceService.this;
+        }
+    }
+    public TestVoiceService() {
+        super("TestVoiceService");
+        System.out.println("START SERVICE");
+
+
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        audioManager=(AudioManager) getSystemService(Context.AUDIO_SERVICE);
+        mState = State.STOP;
+
+        sampleReceiver=new ComponentName(this,VoicememoReceiver.class);
+        mediaPlayer=new MediaPlayer();
+        mediaSession=new MediaSessionCompat(getApplicationContext(),TAG);
+        //このMediaSessionが提供する機能を設定
+        mediaSession.setFlags(
+                MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS | //キュー系のコマンドの使用をサポート
+                MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS
+        ); //再生、停止、スキップ等のコントロールを提供
+        mediaSession.setCallback(callback);
+        IntentFilter intentFilter=new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_MEDIA_BUTTON);
+        intentFilter.addDataScheme("package");
+        BroadcastReceiver broadcastReceiver=new BroadcastReceiver() {
+            MediaControllerCompat mediaController;
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                System.out.println("RECEIVE");
+                if(mediaController==null){
+                    try {
+                        mediaController=new MediaControllerCompat(TestVoiceService.this,getToken());
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                    }
+                }
+
+
+                if (intent.getAction().equals(Intent.ACTION_MEDIA_BUTTON)) {
+                    KeyEvent keyEvent = (KeyEvent) intent.getExtras().get(
+                            Intent.EXTRA_KEY_EVENT);
+                    if (keyEvent.getAction() == KeyEvent.ACTION_DOWN){
+
+                        switch (keyEvent.getKeyCode()) {
+                            case KeyEvent.KEYCODE_HEADSETHOOK:
+                            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+                                // ヘッドセットのフックボタン押下時 or 再生/一時停止ボタン押下時の処理を記述
+                                //context.startService(new Intent(TestVoiceService.ACTION_TOGGLE));
+                                mediaController.getTransportControls().pause();
+                                break;
+                            case KeyEvent.KEYCODE_MEDIA_PLAY:
+                                // 再生ボタン押下時の処理を記述
+                                break;
+                            case KeyEvent.KEYCODE_MEDIA_PAUSE:
+                                // 一時停止ボタン押下時の処理を記述
+                                break;
+                            case KeyEvent.KEYCODE_MEDIA_STOP:
+                                // 停止ボタン押下時の処理を記述
+                                break;
+                            case KeyEvent.KEYCODE_MEDIA_NEXT:
+                                // 次へボタン押下時の処理を記述
+                                break;
+                            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+                                // 戻るボタン押下時の処理を記述
+                                break;
+                        }
+                    }
+                }
+            }
+        };
+        registerReceiver(broadcastReceiver, intentFilter);
+     //   sendBroadcast();
+
+    }
+    public MediaSessionCompat.Token getToken(){
+        return mediaSession.getSessionToken();
+    }
+
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        String action = intent.getAction();
+        if(action==null)return START_NOT_STICKY;
+        // ロック画面で再生/一時停止ボタン押下時
+        if (action.equals(ACTION_TOGGLE)) {
+            if (mState == State.PAUSE || mState == State.STOP) {
+                // 停止/一時停止中の場合は再生
+                playMusic();
+            } else {
+                // 再生中の場合は一時停止
+                mState = State.PAUSE;
+                mediaPlayer.pause();
+
+
+            }
+        }
+
+        // MainActivityで再生ボタン押下時
+        else if (action.equals(ACTION_PLAY)) {
+            if (mediaPlayer != null) {
+                clean();
+            }
+            callback.onPlay();
+        }
+
+        // サービス開始 or 既存サービスの再利用
+        return START_NOT_STICKY;
+    }
+    public void clean() {
+        mState = State.STOP;
+        mediaPlayer.reset();
+        mediaPlayer.release();
+        mediaPlayer = null;
+    }
+
+
+    public void onPrepared(MediaPlayer player) {
+        mState = State.PLAY;
+        if (!mediaPlayer.isPlaying()) {
+            mediaPlayer.start();
+        }
+    }
+
+    public IBinder onBind(Intent intent){
+        Log.d(TAG,"onBind");
+        return myBinder;
+
+    }
+
+    public void play(){
+        final String url = "http://nitta-lab-www.is.konan-u.ac.jp/data/c948c729-a516-4ca2-88f3-35c0f2d20dba.3gp";
+        final String url2="http://nitta-lab-www.is.konan-u.ac.jp/data/c948c729-a516-4ca2-88f3-35c0f2d20dba.3gp";
+        mediaPlayer=new MediaPlayer();
+        mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+
+        try {
+            mediaPlayer.reset();
+            mediaPlayer.setDataSource(url2);
+            mediaPlayer.prepare();
+            mediaPlayer.start();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void testCall(){
+        System.out.println("CALL!!!!");
+    }
+
+    public void playMusic() {
+        if (mState == State.STOP) {
+            // 停止中の場合はメディアプレーヤーに必要情報をセットして再生
+            prepareAndPlay();
+        } else if (mState == State.PAUSE && !mediaPlayer.isPlaying()) {
+            // 一時停止中の場合は再開する
+            mState = State.PLAY;
+            mediaPlayer.start();
+        }
+
+    }
+    public void prepareAndPlay() {
+        mState = State.STOP;
+        final String url = "http://nitta-lab-www.is.konan-u.ac.jp/data/c948c729-a516-4ca2-88f3-35c0f2d20dba.3gp";
+        // メディアプレイヤーで再生する音楽をセットする
+        //mediaPlayer = MediaPlayer.create(getApplicationContext(), R.raw.sample);
+        mediaPlayer=new MediaPlayer();
+        mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+        try {
+            mediaPlayer.reset();
+            mediaPlayer.setDataSource(url);
+            mediaPlayer.prepare();
+//            mediaPlayer.setLooping(true);
+            mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+                @Override
+                public void onCompletion(MediaPlayer mediaPlayer) {
+
+                }
+            });
+            //mediaPlayer.start();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    protected void onHandleIntent(@Nullable Intent intent) {
+
+    }
+    //MediaSession用コールバック
+    private MediaSessionCompat.Callback callback = new MediaSessionCompat.Callback() {
+
+        //曲のIDから再生する
+        //WearやAutoのブラウジング画面から曲が選択された場合もここが呼ばれる
+        @Override
+        public void onPlayFromMediaId(String mediaId, Bundle extras) {
+            //今回はAssetsフォルダに含まれる音声ファイルを再生
+            //Uriから再生する
+            //DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), Util.getUserAgent(getApplicationContext(), "AppName"));
+           // MediaSource mediaSource = new ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(Uri.parse("file:///android_asset/" + MusicLibrary.getMusicFilename(mediaId)));
+
+            //今回は簡易的にmediaIdからインデックスを割り出す。
+
+            onPlay();
+
+            //MediaSessionが配信する、再生中の曲の情報を設定
+            //mediaSession.setMetadata(MusicLibrary.getMetadata(getApplicationContext(), mediaId));
+        }
+
+        //再生をリクエストされたとき
+        @Override
+        public void onPlay() {
+            //オーディオフォーカスを要求
+//            if (audioManager.requestAudioFocus(afChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+//                //取得できたら再生を始める
+//                mediaSession.setActive(true);
+//                //mediaPlayer;
+//            }
+            mediaSession.setActive(true);
+            final String url = "http://nitta-lab-www.is.konan-u.ac.jp/data/c948c729-a516-4ca2-88f3-35c0f2d20dba.3gp";
+            System.out.println("PLAYだよ！");
+            mediaPlayer=new MediaPlayer();
+            mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            try {
+                mediaPlayer.reset();
+                mediaPlayer.setDataSource(url);
+                mediaPlayer.prepare();
+//            mediaPlayer.setLooping(true);
+
+                mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+                    @Override
+                    public void onCompletion(MediaPlayer mediaPlayer) {
+
+                    }
+                });
+                mediaPlayer.start();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            CreateNotification();
+        }
+
+        //一時停止をリクエストされたとき
+        @Override
+        public void onPause() {
+//            exoPlayer.setPlayWhenReady(false);
+//            //オーディオフォーカスを開放
+//            am.abandonAudioFocus(afChangeListener);
+        }
+
+        //停止をリクエストされたとき
+        @Override
+        public void onStop() {
+//            onPause();
+//            mSession.setActive(false);
+//            //オーディオフォーカスを開放
+//            am.abandonAudioFocus(afChangeListener);
+        }
+
+        //シークをリクエストされたとき
+        @Override
+        public void onSeekTo(long pos) {
+//            exoPlayer.seekTo(pos);
+        }
+
+        //次の曲をリクエストされたとき
+        @Override
+        public void onSkipToNext() {
+//            index++;
+//            if (index >= MusicLibrary.getMediaItems().size())//ライブラリの最後まで再生したら
+//                index = 0;//最初に戻す
+//
+//            onPlayFromMediaId(queueItems.get(index).getDescription().getMediaId(), null);
+        }
+
+        //前の曲をリクエストされたとき
+        @Override
+        public void onSkipToPrevious() {
+//            index--;
+//            if (index < 0)//インデックスが0以下になったら
+//                index = queueItems.size() - 1;//最後の曲に移動する
+//
+//            onPlayFromMediaId(queueItems.get(index).getDescription().getMediaId(), null);
+        }
+
+        //WearやAutoでキュー内のアイテムを選択された際にも呼び出される
+        @Override
+        public void onSkipToQueueItem(long i) {
+//            onPlayFromMediaId(queueItems.get((int)i).getDescription().getMediaId(), null);
+        }
+
+        //Media Button Intentが飛んできた時に呼び出される
+        //オーバーライド不要（今回はログを吐くだけ）
+        //MediaSessionのplaybackStateのActionフラグに応じてできる操作が変わる
+        @Override
+        public boolean onMediaButtonEvent(Intent mediaButtonEvent) {
+            KeyEvent key = mediaButtonEvent.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
+            Log.d(TAG, String.valueOf(key.getKeyCode()));
+            return super.onMediaButtonEvent(mediaButtonEvent);
+        }
+    };
+
+    //通知を作成、サービスをForegroundにする
+    private void CreateNotification() {
+
+        MediaControllerCompat controller = mediaSession.getController();
+        MediaMetadataCompat mediaMetadata = controller.getMetadata();
+
+        Notification notification;
+        //システムから通知マネージャー取得
+        NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
+        //アプリ名をチャンネルIDとして利用
+        String chID = getString(R.string.app_name);
+
+        //アンドロイドのバージョンで振り分け
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {     //APIが「26」以上の場合
+
+            //通知チャンネルIDを生成してインスタンス化
+            NotificationChannel notificationChannel = new NotificationChannel(chID, chID, NotificationManager.IMPORTANCE_DEFAULT);
+            //通知の説明のセット
+            notificationChannel.setDescription(chID);
+            //通知チャンネルの作成
+            notificationManager.createNotificationChannel(notificationChannel);
+            //通知の生成と設定とビルド
+            notification = new NotificationCompat.Builder(this, chID)
+                    .setContentTitle(getString(R.string.app_name))  //通知タイトル
+                    .setContentText("アプリ通知テスト26以上")//通知内容
+
+                    .setSmallIcon(R.drawable.ic_baseline_play_circle_outline_24)//通知用アイコン
+                    .setContentIntent(controller.getSessionActivity())
+                    .setSound(null)
+                    .addAction(new NotificationCompat.Action(
+                            R.drawable.ic_baseline_pause_circle_outline_24, getString(R.string.app_name),
+                            MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+                                    PlaybackStateCompat.ACTION_PLAY_PAUSE)))
+                    .addAction(new NotificationCompat.Action(
+                            R.drawable.ic_baseline_play_circle_outline_24, getString(R.string.app_name),
+                            MediaButtonReceiver.buildMediaButtonPendingIntent(this,
+                                    PlaybackStateCompat.ACTION_PLAY)))
+                    .setStyle(new androidx.media.app.NotificationCompat.MediaStyle().
+                            setMediaSession(mediaSession.getSessionToken())
+                            .setShowActionsInCompactView(0))
+                            .build();                                       //通知のビルド
+
+        } else {
+            //APIが「25」以下の場合
+            //通知の生成と設定とビルド
+            notification = new Notification.Builder(this)
+                    .setContentTitle(getString(R.string.app_name))
+                    .setContentText("アプリ通知テスト25まで")
+                    .setSmallIcon(R.drawable.ic_baseline_play_circle_outline_24)
+                    .build();
+        }
+
+        //通知の発行
+        notificationManager.notify(1, notification);
+    }
+
+    //通知をクリックしてActivityを開くインテントを作成
+    private PendingIntent createContentIntent() {
+        Intent openUI = new Intent(this, TestPlayActivity.class);
+        openUI.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        return PendingIntent.getActivity(
+                this, 1, openUI, PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+
+}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoiceMemo.java b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoiceMemo.java
new file mode 100644
index 0000000..3f17dd8
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoiceMemo.java
@@ -0,0 +1,169 @@
+package org.ntlab.amaryllis.client.voiceservice;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import org.w3c.dom.Comment;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+
+public class VoiceMemo {
+    private String vid;
+    private String uid;
+    private Calendar upload;
+    private Integer time;
+    private String data;
+    private double latitude;
+    private double longitude;
+    private String title;
+    private String summary;
+    private Integer times;
+    @JsonIgnore
+    private ArrayList<String> favolist;
+    private Integer favos;
+    private ArrayList<String> categories;
+    private HashMap<String, Comment> commentMap = new HashMap<>();
+
+    public VoiceMemo() {}
+
+    public VoiceMemo(String vid, String uid, Integer time, String url, double latitude, double longitude, String title, String summary, ArrayList<String> categories) {
+        Calendar upload = Calendar.getInstance();
+        setVid(vid);
+        setUid(uid);
+        setUpload(upload);
+        setTime(time);
+        setData(url);
+        setLatitude(latitude);
+        setLongitude(longitude);
+        setTitle(title);
+        setSummary(summary);
+        setCategory(categories);
+        this.times = 0;
+        this.favos = 0;
+    }
+
+
+
+
+    public String getVid() {
+        return vid;
+    }
+    private void setVid(String vid) {
+        this.vid = vid;
+    }
+    private String getUid() {
+        return uid;
+    }
+    private void setUid(String uid) {
+        this.uid = uid;
+    }
+    public Calendar getUpload() {
+        return upload;
+    }
+    private void setUpload(Calendar upload) {
+        this.upload = upload;
+    }
+    public Integer getTime() {
+        return time;
+    }
+    private void setTime(Integer time) {
+        this.time = time;
+    }
+    public String getData() {
+        return data;
+    }
+    private void setData(String url) {
+        this.data = url;
+    }
+    public double getLatitude() {
+        return latitude;
+    }
+    private void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+    public double getLongitude() {
+        return longitude;
+    }
+    private void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+    public String getTitle() {
+        return title;
+    }
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getSummary() {
+        return summary;
+    }
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+    public Integer getTimes() {
+        return times;
+    }
+    public void addTimes() {//？どのタイミングで加算するか
+        times++;
+    }
+    public ArrayList<String> getFavolist(){ return favolist; }
+    public boolean checkFavo(String uid){
+        for (String a : favolist) {
+            if (a.equals(vid)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    public void addFavolist(String uid){
+        if(checkFavo(uid)){
+            return;
+        }
+        favolist.add(uid);
+        setFavos();
+    }
+    public void removeFavolist(String uid) {
+        favolist.remove(uid);
+        setFavos();
+    }
+    public Integer getFavos(){ return favos; }
+    private void setFavos(){
+        favos = favolist.size();
+    }
+
+    public void setCategory(ArrayList<String> categories) {
+        this.categories = categories;
+    }
+
+    public ArrayList<String> getCategory(){ return categories; }
+    public void addCategory(String categoryId){
+        for (String a : categories) {
+            if (a.equals(categoryId)) {
+                return;
+            }
+        }
+        categories.add(categoryId);
+    }
+    public void removeCategory(String CategoryId) {
+        categories.remove(CategoryId);
+    }
+    public Collection<Comment> getComments() {
+        return commentMap.values();
+    }
+    public Comment getComment(String commentId) {
+        return commentMap.get(commentId);
+    }
+    //    public Comment createComment(String uid, String text) {
+//        if (uid == null || text == null) {
+//            return null;
+//        }
+//        String commentId = UUID.randomUUID().toString();
+//        Comment newComment = new Comment(commentId, uid, text);
+//        commentMap.put(commentId,newComment);
+//        return newComment;
+//    }
+    public void removeComment(String commentId) {
+        commentMap.remove(commentId);
+    }
+}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoicememoReceiver.java b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoicememoReceiver.java
new file mode 100644
index 0000000..bdc2c8e
--- /dev/null
+++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoicememoReceiver.java
@@ -0,0 +1,67 @@
+package org.ntlab.amaryllis.client.voiceservice;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.v4.media.session.MediaControllerCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.view.KeyEvent;
+
+import org.ntlab.amaryllis.client.TestPlayActivity;
+
+public class VoicememoReceiver extends BroadcastReceiver {
+    TestVoiceService myService;
+    MediaControllerCompat mediaController;
+    ServiceConnection serviceConnection = new ServiceConnection(){
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            myService = ((TestVoiceService.MyBinder)service).getService();
+        }
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            myService = null;
+        }
+    };
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        if (intent.getAction().equals(Intent.ACTION_MEDIA_BUTTON)) {
+            Intent startServiceIntent = new Intent(context,TestVoiceService.class);
+
+            KeyEvent keyEvent = (KeyEvent) intent.getExtras().get(
+                    Intent.EXTRA_KEY_EVENT);
+            if (keyEvent.getAction() == KeyEvent.ACTION_DOWN){
+
+                switch (keyEvent.getKeyCode()) {
+                    case KeyEvent.KEYCODE_HEADSETHOOK:
+                    case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+                        // ヘッドセットのフックボタン押下時 or 再生/一時停止ボタン押下時の処理を記述
+                        //context.startService(new Intent(TestVoiceService.ACTION_TOGGLE));
+
+                        break;
+                    case KeyEvent.KEYCODE_MEDIA_PLAY:
+                        // 再生ボタン押下時の処理を記述
+                        startServiceIntent.setAction(TestVoiceService.ACTION_PLAY);
+                        context.startService(startServiceIntent);
+                        break;
+                    case KeyEvent.KEYCODE_MEDIA_PAUSE:
+                        // 一時停止ボタン押下時の処理を記述
+                        break;
+                    case KeyEvent.KEYCODE_MEDIA_STOP:
+                        // 停止ボタン押下時の処理を記述
+                        break;
+                    case KeyEvent.KEYCODE_MEDIA_NEXT:
+                        // 次へボタン押下時の処理を記述
+                        break;
+                    case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+                        // 戻るボタン押下時の処理を記述
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/res/drawable/ic_baseline_pause_circle_outline_24.xml b/app/src/main/res/drawable/ic_baseline_pause_circle_outline_24.xml
new file mode 100644
index 0000000..fcd7c59
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_pause_circle_outline_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#D37700"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9,16h2L11,8L9,8v8zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM13,16h2L15,8h-2v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_play_circle_outline_24.xml b/app/src/main/res/drawable/ic_baseline_play_circle_outline_24.xml
new file mode 100644
index 0000000..fdc98fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_play_circle_outline_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#D37700"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 4d41f7e..b6381cc 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -17,7 +17,7 @@
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.182" />
+        app:layout_constraintVertical_bias="0.418" />
 
     <Button
         android:id="@+id/login"
@@ -44,28 +44,37 @@
         app:layout_constraintVertical_bias="0.0" />
 
     <EditText
-        android:id="@+id/uid"
+        android:id="@+id/name"
         android:layout_width="199dp"
         android:layout_height="58dp"
         android:ems="10"
         android:inputType="textPersonName"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/passWord"
-        app:layout_constraintHorizontal_bias="0.497"
-        app:layout_constraintStart_toStartOf="@+id/passWord"
-        app:layout_constraintTop_toBottomOf="@+id/passWord"
-        app:layout_constraintVertical_bias="0.145" />
+        app:layout_constraintBottom_toTopOf="@+id/passWord"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.62" />
 
     <TextView
-        android:id="@+id/uidtext"
+        android:id="@+id/nametext"
         android:layout_width="47dp"
         android:layout_height="23dp"
-        android:text="uid"
-        app:layout_constraintBottom_toBottomOf="@+id/uid"
-        app:layout_constraintEnd_toStartOf="@+id/uid"
+        android:text="name"
+        app:layout_constraintBottom_toBottomOf="@+id/name"
+        app:layout_constraintEnd_toStartOf="@+id/name"
         app:layout_constraintHorizontal_bias="0.44"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/uid"
+        app:layout_constraintTop_toTopOf="@+id/name"
         app:layout_constraintVertical_bias="0.0" />
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="※パスワードは8文字以上です"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d4cd154..31acee6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,6 +5,10 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#FFFFFF"
+    android:backgroundTint="@color/design_default_color_background"
+    android:foregroundTint="#FFFFFF"
+    android:visibility="visible"
     tools:context=".MainActivity">
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
@@ -21,7 +25,9 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/bottom_nav_menu" />
+        app:menu="@menu/bottom_nav_menu">
+
+    </com.google.android.material.bottomnavigation.BottomNavigationView>
 
     <fragment
         android:id="@+id/nav_host_fragment"
@@ -38,5 +44,75 @@
         app:layout_constraintVertical_bias="0.431"
         app:navGraph="@navigation/mobile_navigation" />
 
+    <ImageView
+        android:id="@+id/imageView4"
+        android:layout_width="420dp"
+        android:layout_height="74dp"
+        android:background="#C5C5C5"
+        android:foregroundTint="#483C3C"
+        android:tint="#FFFFFF"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@+id/nav_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="@+id/nav_host_fragment"
+        app:layout_constraintTop_toTopOf="@+id/nav_host_fragment"
+        app:layout_constraintVertical_bias="1.0"
+        app:srcCompat="@android:drawable/bottom_bar" />
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="166dp"
+        android:layout_height="54dp"
+        android:layout_marginBottom="8dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@+id/nav_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.93"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0">
+
+        <ImageButton
+            android:id="@+id/playbutton"
+            android:layout_width="55dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="#DCDCDC"
+            android:visibility="visible"
+            app:srcCompat="@android:drawable/ic_btn_speak_now"
+            tools:layout_editor_absoluteX="34dp"
+            tools:layout_editor_absoluteY="576dp"
+            tools:visibility="visible" />
+
+        <ImageButton
+            android:id="@+id/stopbutton"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            app:srcCompat="@android:drawable/ic_media_pause" />
+
+        <ImageButton
+            android:id="@+id/skipbutton"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            app:srcCompat="@android:drawable/ic_media_ff" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="205dp"
+        android:layout_height="30dp"
+        android:text="タイトル"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/nav_view"
+        app:layout_constraintEnd_toStartOf="@+id/linearLayout"
+        app:layout_constraintHorizontal_bias="0.631"
+        app:layout_constraintStart_toStartOf="@+id/nav_host_fragment"
+        app:layout_constraintTop_toTopOf="@+id/nav_host_fragment"
+        app:layout_constraintVertical_bias="0.968" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index ae97e94..de3fd30 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -79,4 +79,14 @@
         app:layout_constraintTop_toBottomOf="@+id/passWord"
         app:layout_constraintVertical_bias="0.734" />
 
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="67dp"
+        android:layout_height="10dp"
+        android:text="※パスワードは８文字以上です"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_test_play.xml b/app/src/main/res/layout/activity_test_play.xml
new file mode 100644
index 0000000..f419950
--- /dev/null
+++ b/app/src/main/res/layout/activity_test_play.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".TestPlayActivity">
+
+    <Button
+        android:id="@+id/button_connect"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Connect"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView_title"
+        android:layout_width="66dp"
+        android:layout_height="16dp"
+        android:text="TextView"
+        app:layout_constraintBottom_toTopOf="@+id/button_connect"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.539" />
+
+    <TextView
+        android:id="@+id/textView_position"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_connect" />
+
+    <Button
+        android:id="@+id/button_play"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="play"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView_position" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index f3b801b..8028c4e 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -12,7 +12,7 @@
 
 
     <Button
-        android:id="@+id/button3"
+        android:id="@+id/change"
         android:layout_width="61dp"
         android:layout_height="37dp"
         android:text="変更"
@@ -24,9 +24,9 @@
         app:layout_constraintVertical_bias="0.417" />
 
     <EditText
-        android:id="@+id/editTextTextPersonName"
-        android:layout_width="177dp"
-        android:layout_height="37dp"
+        android:id="@+id/name"
+        android:layout_width="196dp"
+        android:layout_height="52dp"
         android:ems="10"
         android:gravity="left"
         android:inputType="textPersonName"
@@ -39,13 +39,13 @@
         app:layout_constraintVertical_bias="0.115" />
 
     <EditText
-        android:id="@+id/editTextTextPersonName2"
+        android:id="@+id/introduction"
         android:layout_width="345dp"
         android:layout_height="125dp"
         android:ems="10"
         android:gravity="left"
         android:inputType="textMultiLine|textPersonName"
-        android:text="Name"
+        android:text="自己紹介"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.242"
diff --git a/app/src/main/res/menu/nav_drawer_menu.xml b/app/src/main/res/menu/nav_drawer_menu.xml
new file mode 100644
index 0000000..2caa7a4
--- /dev/null
+++ b/app/src/main/res/menu/nav_drawer_menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_menu"
+    tools:showIn="navigation_drawer_view">
+
+    <group android:checkableBehavior="all">
+    </group>
+
+
+</menu>
\ No newline at end of file