diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index d01fa8d..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java index d66f0aa..f73e19d 100644 --- a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java @@ -59,7 +59,7 @@ } @Override public void onFailure(Call> call, Throwable t) { - System.out.println("通信失敗:createDrawTest"); + System.out.println("通信失敗"); System.out.println(t); } }); @@ -87,7 +87,7 @@ } @Override public void onFailure(Call> call, Throwable t) { - System.out.println("通信失敗:createDrawTest"); + System.out.println("通信失敗"); System.out.println(t); } }); diff --git a/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java index 16df8be..34a11d4 100644 --- a/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java @@ -31,7 +31,7 @@ .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/") .addConverterFactory(JacksonConverterFactory.create()) .build(); - final RoomsRest roomRests = retrofit.create(RoomsRest.class); + final RoomsRest roomsRest = retrofit.create(RoomsRest.class); //上の表示を削除 ActionBar actionBar = getSupportActionBar(); @@ -47,18 +47,18 @@ ((Iris) getApplication()).setNickname("RedSpy(owner)"); ((Iris) getApplication()).setTeam("r"); ((Iris) getApplication()).setMaster(true); - Call> call = roomRests.getRoomMember("gametest"); + Call> call = roomsRest.getRoomMember("gametest"); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { if (response.isSuccessful()){ - System.out.println("通信成功:createDrawTest"); + System.out.println("通信成功"); ((Iris) getApplication()).setMemberList(response.body()); } } @Override public void onFailure(Call> call, Throwable t) { - System.out.println("通信失敗:createDrawTest"); + System.out.println("通信失敗"); System.out.println(t); } }); @@ -76,7 +76,7 @@ ((Iris) getApplication()).setNickname("RedAgent"); ((Iris) getApplication()).setTeam("r"); ((Iris) getApplication()).setMaster(false); - Call> call = roomRests.getRoomMember("gametest"); + Call> call = roomsRest.getRoomMember("gametest"); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -105,7 +105,7 @@ ((Iris) getApplication()).setNickname("BlueSpy"); ((Iris) getApplication()).setTeam("b"); ((Iris) getApplication()).setMaster(true); - Call> call = roomRests.getRoomMember("gametest"); + Call> call = roomsRest.getRoomMember("gametest"); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -134,7 +134,7 @@ ((Iris) getApplication()).setNickname("BlueAgent"); ((Iris) getApplication()).setTeam("b"); ((Iris) getApplication()).setMaster(false); - Call> call = roomRests.getRoomMember("gametest"); + Call> call = roomsRest.getRoomMember("gametest"); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { diff --git a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java index 496f92e..9d99469 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java @@ -97,7 +97,19 @@ @Path("tno") Integer tno ); + //----------------------------------------------- + @GET("rooms/{rid}/game/turns/{tno}/turnstate") + Call getTurnstate( + @Path("rid") String rid, + @Path("tno") Integer tno + ); + //----------------------------------------------- + @GET("rooms/{rid}/game/turns/{tno}/Endstate") + Call getEndstate( + @Path("rid") String rid, + @Path("tno") Integer tno + ); //----------------------------------------------- // tnoに指定したターンに開けたカードのcnoを取得するメソッド @@ -107,8 +119,6 @@ @Path("tno") Integer tno ); - - //----------------------------------------------- // 現在のターンで開くカードのcnoを送信するメソッド @PUT("rooms/{rid}/game/turns/{tno}/openlist")