diff --git a/.idea/misc.xml b/.idea/misc.xml index f386631..4f52526 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -18,7 +18,7 @@ - + diff --git a/app/src/main/java/org/ntlab/irisclient/entities/DrawingJson.java b/app/src/main/java/org/ntlab/irisclient/entities/DrawingJson.java deleted file mode 100644 index b7d724a..0000000 --- a/app/src/main/java/org/ntlab/irisclient/entities/DrawingJson.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.ntlab.irisclient.entities; - -public class DrawingJson { - - //フィールド - private String drawingPath; - - public DrawingJson(String drawingPath){ - this.drawingPath = drawingPath; - } - - public String getDrawingPath(){return drawingPath;} - - public void setDrawingPath(String drawingPath){this.drawingPath = drawingPath;} -} diff --git a/app/src/main/java/org/ntlab/irisclient/models/Drawing.java b/app/src/main/java/org/ntlab/irisclient/models/Drawing.java new file mode 100644 index 0000000..ca2da6f --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/models/Drawing.java @@ -0,0 +1,14 @@ +package org.ntlab.irisclient.models; + +//import com.fasterxml.jackson.annotation.JsonProperty; + +public class Drawing { + //@JsonProperty("drawing") + private String drawingPath; + + // getter + public String getDrawing() {return this.drawingPath;} + + // setter + public void setDrawing(String drawing) {this.drawingPath = drawing;} +} diff --git a/app/src/main/java/org/ntlab/irisclient/resources/DrawingRest.java b/app/src/main/java/org/ntlab/irisclient/resources/DrawingRest.java index 439440c..46552c5 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/DrawingRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/DrawingRest.java @@ -1,7 +1,6 @@ package org.ntlab.irisclient.resources; -import org.ntlab.irisclient.entities.DrawingJson; - +import org.ntlab.irisclient.models.Drawing; import retrofit2.Call; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; @@ -14,7 +13,7 @@ //----------------------------------------------- // 絵のデータを取得するメソッド @GET("/{rid}/game/drawings/{dno}") - Call getRoomMember( + Call getRoomMember( @Path("rid") String rid ); diff --git a/app/src/main/java/org/ntlab/irisclient/resources/DrawingState.java b/app/src/main/java/org/ntlab/irisclient/resources/DrawingState.java index 8531bac..5b71be8 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/DrawingState.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/DrawingState.java @@ -1,4 +1,16 @@ package org.ntlab.irisclient.resources; + +import retrofit2.Call; +import retrofit2.http.GET; +import retrofit2.http.Path; + public interface DrawingState { + //----------------------------------------------- + //今書いてほしいdnoを取得するメソッド + @GET("/{rid}/game/drawings/assignment/{nickname}") + Call getDno( + @Path("rid") String rid, + @Path("nickname") String nickname + ); }