diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java index 1c9421e..5c586d0 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java @@ -1,15 +1,14 @@ package org.ntlab.acanthus_client.entities; import java.util.ArrayList; -import java.util.Collection; //----------------------------------------------------------------- // アニメーション public class AnimationJson { private Integer aid; - private Integer ownerUid; private String animationName; - private ArrayList editors; + private Integer owner; + //private ArrayList editors; private String createdDate; //----------------------------------------------------------------- @@ -20,7 +19,7 @@ public Integer getAid() {return this.aid;} - public ArrayList getEditor(){return this.editors;} + //public ArrayList getEditor(){return this.editors;} public String getCreatedDate(){return this.createdDate;} @@ -32,11 +31,11 @@ this.animationName = name; } - public void setOwnerUid(Integer uid) { - this.ownerUid = uid; + public void setOwner(Integer uid) { + this.owner = uid; } - public void addEditors(Editor editor) { - this.editors.add(editor); - } +// public void addEditors(Editor editor) { +// this.editors.add(editor); +// } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java index bde7820..864d6e4 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java @@ -54,9 +54,11 @@ call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - Collection animList = response.body(); - animationMutableLiveData.setValue(animList); - acanthus.setAnimationJsonList(animList); + if (response.isSuccessful()){ + Collection animList = response.body(); + animationMutableLiveData.setValue(animList); + acanthus.setAnimationJsonList(animList); + } } @Override diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java index 8394294..a0f6b23 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java @@ -37,9 +37,9 @@ for(AnimationJson animationJson: animationJsons){ this.titles.add(animationJson.getAnimationName()); ArrayList editors = new ArrayList<>(); - for(Editor editor: animationJson.getEditor()){ - editors.add(editor.getEditorAccount().getName()); - } +// for(Editor editor: animationJson.getEditor()){ +// editors.add(editor.getEditorAccount().getName()); +// } animationEditors.add(editors); this.createdDates.add(animationJson.getCreatedDate()); }