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 b7fdd22..32bc7c9 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 @@ -1,18 +1,38 @@ package org.ntlab.amaryllis.client.voiceservice; -import android.location.Location; - import java.util.ArrayList; public class PlayListManager { - - public void addVoiceMemos(ArrayList voicememo, Location location){ + 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++) { + 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)); + } } - public void getPlayList(){ + //範囲内にある全てのvoicememoのリスト + public ArrayList getPlayList(){ + return playlist; } - - public void getUnplayed(){ + //まだ聞いていないvoicememoのリスト + public ArrayList getUnplayedList(){ + //毎回リストを返すのか? + unplayedlist.clear(); + for(int i = index; i < playlist.size(); i++){ + unplayedlist.add(playlist.get(i)); + } + return unplayedlist; } - + public void next(){ + index++; + } } 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 index 3bd8f4c..115bd7f 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoiceMemo.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/voiceservice/VoiceMemo.java @@ -1,4 +1,115 @@ 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.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 favolist; + private Integer favos; + private ArrayList categories; + private HashMap commentMap = new HashMap<>(); + public VoiceMemo(String vid, String uid, Integer time, String url, double latitude, double longitude, String title, String summary) { + Calendar upload = Calendar.getInstance(); + setVid(vid); + setUid(uid); + setUpload(upload); + setTime(time); + setData(url); + setLatitude(latitude); + setLongitude(longitude); + setTitle(title); + setSummary(summary); + 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 getFavolist(){ return favolist; } + public boolean checkFavo(String uid){ + for (String a : favolist) { + if (a.equals(vid)) { + return true; + } + } + return false; + } }