diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java index 8a52556..f03117e 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java @@ -56,6 +56,10 @@ String toastMessage; //editText = findViewById(R.id.editText); + private ArrayList category; + + + private String data; @@ -307,6 +311,11 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { final int n = 5; + + category = new ArrayList<>(); + category.add("c01"); + category.add("c02"); + //toastMessage = "タイトルが入力されていません"; /* @@ -417,9 +426,10 @@ voicememosService = retrofit.create(VoicememosRest.class); Amaryllis amaryllis = (Amaryllis) getActivity().getApplication(); data = amaryllis.getData(); + //voiceデータの改行を消去 String str = data.replace("\n", ""); - Call call = voicememosService.postVoicememos(amaryllis.getUid(), amaryllis.getToken(), 10, str, 35, 135, "untitled", "abcde"); + Call call = voicememosService.postVoicememos(amaryllis.getUid(), amaryllis.getToken(), 10, str, 35, 135, "untitled", "abcde",category); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { 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 84c46a3..16b2077 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,7 @@ 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) { + public Voicememo(String vid, String uid, Integer time, String url, double latitude, double longitude, String title, String summary,ArrayList category) { Calendar upload = Calendar.getInstance(); setVid(vid); setUid(uid); @@ -36,6 +36,7 @@ setLongitude(longitude); setTitle(title); setSummary(summary); + //addCategory(category); this.times = 0; this.favos = 0; } @@ -97,6 +98,15 @@ public void setSummary(String summary) { this.summary = summary; } + + //public ArrayList getcategory() { + //return category; + //} + //private void setcategory(ArrayList category) { + //this.category = category; + //} + + public Integer getTimes() { return times; } 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 acdb953..7f44b82 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 @@ -42,7 +42,8 @@ @Field("latitude") double latitude, @Field("longitude") double longitude, @Field("title") String title, - @Field("summary") String summary + @Field("summary") String summary, + @Field("category") ArrayList category ); //指定された投稿の情報を取得