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 4b964b2..3319aba 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java @@ -34,16 +34,20 @@ import android.view.MenuItem; import android.view.View; import android.widget.ImageButton; +import android.widget.TextView; import android.widget.Toast; import com.google.android.material.bottomnavigation.BottomNavigationView; import org.ntlab.amaryllis.client.entities.AmaryllisBackgroundService; import org.ntlab.amaryllis.client.entities.Category; +import org.ntlab.amaryllis.client.entities.PlayListListener; +import org.ntlab.amaryllis.client.entities.Voicememo; import org.ntlab.amaryllis.client.fragment.MapsFragment; import org.ntlab.amaryllis.client.resources.AccountsRest; import org.ntlab.amaryllis.client.resources.CategoriesRest; import org.ntlab.amaryllis.client.voiceservice.TestVoiceService; +import org.ntlab.amaryllis.client.voiceservice.VoiceMemo; import java.util.ArrayList; import java.util.HashMap; @@ -65,7 +69,7 @@ ImageButton playbutton; ImageButton stopbutton; ImageButton skipbutton; - + TextView titleView; AmaryllisBackgroundService myService; MediaControllerCompat mediaController; @@ -78,6 +82,17 @@ } catch (RemoteException e) { e.printStackTrace(); } + myService.subscribe(new PlayListListener() { + @Override + public void onPlayNext(VoiceMemo voicememo) { + titleView.setText(voicememo.getTitle()); + } + + @Override + public void onPlayEnd() { + + } + }); //myService.setMessage("Hello, IBinder!"); //startService(serviceIntent); } @@ -136,25 +151,13 @@ playbutton.setEnabled(true); playbutton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - playfrag++; - if((playfrag%2)==0){ - //こっち側がオフ - }else{ - //こっち側がオン - } + mediaController.getTransportControls().play(); } }); stopbutton = (ImageButton)findViewById(R.id.stopbutton); stopbutton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - stopfrag++; - if((stopfrag%2)==0){ - //こっち側がオフ - }else{ - //こっち側がオン - } - mediaController.getTransportControls().pause(); } }); @@ -164,7 +167,7 @@ mediaController.getTransportControls().skipToNext(); } }); - + titleView=(TextView) findViewById(R.id.textView); 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) {