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 index e5e0edd..80a5faa 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java @@ -25,11 +25,19 @@ } //まだ聞いていないvoicememoのリスト public ArrayList getUnplayedList(){ - //毎回リストを返すのか? - unplayedlist.clear(); - for(int i = index; i < playlist.size(); i++){ - unplayedlist.add(playlist.get(i)); + unplayedlist.remove(0); + 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; } 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 index 94c9cb3..a289a3a 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/TestVoiceService.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/TestVoiceService.java @@ -31,7 +31,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.media2.exoplayer.external.ExoPlayer; + public class TestVoiceService extends IntentService { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d4cd154..7bb78b0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,6 +5,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" + android:visibility="visible" tools:context=".MainActivity"> + app:menu="@menu/bottom_nav_menu" > + + + + + + + + + + + + + \ No newline at end of file