diff --git a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java index 8587791..29e3d7b 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java @@ -1,6 +1,7 @@ package org.ntlab.irisclient.entities; import java.util.List; + public class MemberJson { private String nickname; private String belongs; diff --git a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java index 708b405..bb6bfb7 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java @@ -1,8 +1,8 @@ package org.ntlab.irisclient.entities; import android.provider.Settings; - -import java.lang.reflect.Member; +import org.ntlab.irisclient.models.Member; +import org.ntlab.irisclient.models.Room; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -70,8 +70,6 @@ - - //-------------------------------------------------------------- //setter public void setOwnerName(String ownerName) { diff --git a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java index 1aab2fd..ec4a8f8 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java @@ -2,6 +2,7 @@ import org.ntlab.irisclient.entities.MemberJson; import org.ntlab.irisclient.entities.RoomJson; +import org.ntlab.irisclient.models.Settings; import java.util.List; @@ -78,7 +79,7 @@ //---------------------------------------- //設定の情報を入手するメソッド @GET("rooms/{rid}/settings") - Call getSettings( + Call getSettings( @Path("rid") String rid ); @@ -86,7 +87,7 @@ //ゲームの設定を記録するメソッド @FormUrlEncoded @PUT("rooms/{rid}/settings") - Call putSettings( + Call putSettings( @Path("rid") String rid, @Field("drawingTimer") boolean dTimer, @Field("drawingTimerTimes") int dTimerTimes, @@ -98,7 +99,8 @@ //----------------------------------------------- //部屋の情報を入手するメソッド @GET("rooms/{rid}/state") - Call getState( + //ここサーバー側はintになってます + Call getState( @Path("rid") String rid ); @@ -106,7 +108,7 @@ //部屋の状態を記録するメソッド @FormUrlEncoded @PUT("rooms/{rid}/state") - Call putState( + Call putState( @Path("rid") String rid, @Field("nickname") String nickname, @Field("state") Integer state