diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java index 60336d4..b0a2b7d 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java @@ -15,21 +15,21 @@ //----------------------------------------------------------------- // 作品 public class Animation { - private Integer aid; - private Integer likes; - private Integer views; + private int aid; private String name; private String description; - private Account owner; - private Boolean isPublic; - private String createdDate; - private String lastUpdate; +// private Boolean isPublic; + private String createdDate = new String(); + private String lastUpdate = new String(); + private Integer likes; + private Integer views; private ArrayList hashTag = new ArrayList<>(); - private ArrayList editors = new ArrayList<>(); - private ArrayList invites = new ArrayList<>(); private HashMap pageMap = new HashMap<>(); +// private Account owner; +// private ArrayList editors = new ArrayList<>(); +// private ArrayList invites = new ArrayList<>(); private ArrayList pages = new ArrayList<>(); - private boolean isDummy; +// private boolean isDummy; //----------------------------------------------------------------- public Animation() { @@ -38,7 +38,7 @@ public Animation(Integer aid, String name, Account owner) { this.aid = aid; this.name = name; - this.owner = owner; +// this.owner = owner; } //----------------------------------------------------------------- @@ -63,17 +63,15 @@ return this.description; } - public Account getOwner() { - return this.owner; - } +// public Account getOwner() { +// return this.owner; +// } - public Boolean getPublic() { - return this.isPublic; - } +// public Boolean getPublic() { +// return this.isPublic; +// } - public String getCreatedDate() { - return this.createdDate; - } + public String getCreatedDate() { return this.createdDate; } public String getLastUpdate() { return this.lastUpdate; @@ -83,18 +81,22 @@ return this.hashTag; } - public ArrayList getInvites() { - return this.invites; - } - - public ArrayList getEditors() { - return this.editors; - } +// public ArrayList getInvites() { +// return this.invites; +// } +// +// public ArrayList getEditors() { +// return this.editors; +// } public HashMap getPageMap() { return this.pageMap; } + public ArrayList getPages() { + return (this.pages); + } + //----------------------------------------------------------------- // setter public void setAid(Integer aid) { @@ -117,22 +119,22 @@ this.description = description; } - public void setPublic(Boolean aPublic) { - this.isPublic = aPublic; - } +// public void setPublic(Boolean aPublic) { +// this.isPublic = aPublic; +// } //----------------------------------------------------------------- //----------------------------------------------------------------- // 招待するアカウントの追加 - public void addInviteAccount(Account account){ - this.invites.add(account); - } - //----------------------------------------------------------------- - // 編集者の追加 - public void addEditor(Editor editor){ - this.editors.add(editor); - } - //----------------------------------------------------------------- +// public void addInviteAccount(Account account){ +// this.invites.add(account); +// } +// //----------------------------------------------------------------- +// // 編集者の追加 +// public void addEditor(Editor editor){ +// this.editors.add(editor); +// } +// //----------------------------------------------------------------- // 新規ページの追加 public void addPage(Integer page){ 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 fe23182..66cea59 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 @@ -22,7 +22,7 @@ public String getAnimationName(){return this.animationName;} - public Integer getAid() {return this.aid;} + public int getAid() {return this.aid;} //public ArrayList getEditor(){return this.editors;} diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java index e5283cd..10340b0 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Page.java @@ -1,21 +1,18 @@ package org.ntlab.acanthus_client.entities; +import java.util.ArrayList; + //----------------------------------------------------------------- // ページ情報 public class Page { - private Layer layers = new Layer(); + private ArrayList layers = new ArrayList<>(); - //----------------------------------------------------------------- - // getter - public Layer getLayers() { - return layers; + public ArrayList getLayers() { + return this.layers; } - //----------------------------------------------------------------- - // setter - public void setLayers(Layer layers) { + public void setLayers(ArrayList layers) { this.layers = layers; } - //----------------------------------------------------------------- - } + diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Position.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Position.java index 7d254be..ca9913d 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Position.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Position.java @@ -3,6 +3,7 @@ //----------------------------------------------------------------- // ペン座標 public class Position { + private int i; private Float x; private Float y; @@ -18,7 +19,8 @@ //----------------------------------------------------------------- // setter - public void setPosition(float x, float y) { + public void setPosition(int i, float x, float y) { + this.i = i; this.x = x; this.y = y; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java index a1a7c92..893dbe8 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java @@ -5,11 +5,11 @@ //----------------------------------------------------------------- // 筆跡 public class Stroke { - private static int strokeNoCount; //strokeNoを数えるためだけ - private int strokeNo = 0; - private int pen = 0; - private int color = 0; - private int thickness = 0; +// private static int strokeNoCount; //strokeNoを数えるためだけ + private int strokeNo; + private int pen; + private int color; + private int thickness; private ArrayList positions = new ArrayList<>(); public int getStrokeNo() { 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 f59a968..8cb2ea0 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 @@ -1,5 +1,6 @@ package org.ntlab.acanthus_client.views.main_menu_ui.home; +import android.util.Log; import android.widget.EditText; import org.ntlab.acanthus_client.Acanthus; @@ -47,7 +48,7 @@ - public void setCurrentAnimation(Integer aid, Acanthus acanthus) throws IOException { + public void setCurrentAnimation(int aid, Acanthus acanthus) throws IOException { Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") @@ -55,23 +56,25 @@ .build(); final GalleryRest galleryRest = retrofit.create(GalleryRest.class); Call call = galleryRest.getAnimationInformation(aid); - Response response = call.execute(); - animation = response.body(); - acanthus.setCurrentAnimation(animation); -// call.enqueue(new Callback() { -// @Override -// public void onResponse(Call call, Response response) { -// if(response.isSuccessful()){ -// animation = response.body(); -// acanthus.setCurrentAnimation(animation); -// } -// } -// -// @Override -// public void onFailure(Call call, Throwable t) { -// -// } -// }); +// Response response = call.execute(); +// animation = response.body(); +// acanthus.setCurrentAnimation(animation); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()){ + animation = response.body(); + acanthus.setCurrentAnimation(animation); + Log.d(acanthus.getCurrentAnimation().getName(), toString()); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + Log.d("aa", t.toString()); + + } + }); }