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 c8f68ee..ec09458 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 @@ -3,8 +3,9 @@ import java.util.ArrayList; public class PlayListManager{ - int index = -1; + int index = 0; ArrayList playlist = new ArrayList<>(); + ArrayList unplayedlist = new ArrayList<>(); //範囲内にある全てのvoicememoのリストを作成 public void addVoiceMemos(ArrayList voicememos){ for(int i = 0;i < voicememos.size(); i++) { @@ -25,24 +26,32 @@ //次に聞くvoicememoを渡す public ArrayList getUnplayedList(){ - ArrayList unplayedlist = new ArrayList<>(); - next(); - unplayedlist.clear(); - 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)); -// } + +// next(); +// unplayedlist.clear(); +// 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; } + + public VoiceMemo getNextVoicememo(){ + VoiceMemo result=getUnplayedList().remove(0); + next(); + return result; + + } //次のvoicememoに移動する public void next() {