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 3ca53a4..496f92e 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java @@ -85,14 +85,14 @@ //----------------------------------------------- @GET("rooms/{rid}/game/turns/{tno}/hint") - Call getHint( + Call getHint( @Path("rid") String rid, @Path("tno") Integer tno ); //----------------------------------------------- @GET("rooms/{rid}/game/turns/{tno}/Max") - Call getMax( + Call getMax( @Path("rid") String rid, @Path("tno") Integer tno ); @@ -102,7 +102,7 @@ //----------------------------------------------- // tnoに指定したターンに開けたカードのcnoを取得するメソッド @GET("rooms/{rid}/game/turns/{tno}/openlist") - Call> getOpenList( + Call> getOpenList( @Path("rid") String rid, @Path("tno") Integer tno ); @@ -121,7 +121,7 @@ //----------------------------------------------- // マスターのヒントを送信するメソッド + 最大回答数も送信 @PUT("rooms/{rid}/game/turns/{tno}/hint") - Call putHint( + Call putHint( @Path("rid") String rid, @Path("tno") int tno, @Field("hint") String hint, diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java index f2fb8ec..7705ea9 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -25,9 +25,9 @@ final private MutableLiveData turnsMutableLiveData; //final private MutableLiveData turnMutableLiveData; - final private MutableLiveData hintMutableLiveData; - final private MutableLiveData> openListMutableLiveData; - final private MutableLiveData maxMutableLiveData; + final private MutableLiveData hintMutableLiveData; + final private MutableLiveData> openListMutableLiveData; + final private MutableLiveData maxMutableLiveData; final private MutableLiveData> colorMutableLiveData; final private MutableLiveData> opensMutableLiveData; final private MutableLiveData> mapMutableLiveData; @@ -41,9 +41,9 @@ private String turnsPreData = null; private TurnJson turnPreData = null; - private Boolean[] hintPreData = null; - private List openListPreData = null; - private Boolean[] maxPreData = null; + private String hintPreData = null; + private List openListPreData = null; + private Integer maxPreData = null; private List opensPreData = null; private Boolean[] QPreData = null; @@ -95,13 +95,13 @@ // public LiveData getTurnLiveData() { // return this.turnMutableLiveData; // } - public LiveData getHintLiveData() { + public LiveData getHintLiveData() { return this.hintMutableLiveData; } - public LiveData> getopenListLiveData() { + public LiveData> getopenListLiveData() { return this.openListMutableLiveData; } - public LiveData getmaxLiveData() { + public LiveData getmaxLiveData() { return this.maxMutableLiveData; } public LiveData> getOpenLiveData() { @@ -119,17 +119,17 @@ //マスターのヒント、最大回答数を送信 public void sendHint(String hint, Integer max) { - Call call = gameRest.putHint(rid, tno, hint, max); + Call call = gameRest.putHint(rid, tno, hint, max); - call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()){ System.out.println("通信成功:sendHint"); } } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { System.out.println("通信失敗:sendHint"); System.out.println(t); } @@ -353,11 +353,11 @@ //Hintの更新 public void updateHint() { - Call call = gameRest.getHint(rid, tno); + Call call = gameRest.getHint(rid, tno); - call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()){ if(hintPreData == null){ //初回代入 @@ -374,7 +374,7 @@ } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { System.out.println("通信失敗:updateHint"); System.out.println(t); } @@ -383,11 +383,11 @@ //OpenListの更新 public void updateOpenList() { - Call> call = gameRest.getOpenList(rid, tno); + Call> call = gameRest.getOpenList(rid, tno); - call.enqueue(new Callback>() { + call.enqueue(new Callback>() { @Override - public void onResponse(Call> call, Response> response) { + public void onResponse(Call> call, Response> response) { if (response.isSuccessful()){ if(openListPreData == null){ //初回代入 @@ -404,7 +404,7 @@ } @Override - public void onFailure(Call> call, Throwable t) { + public void onFailure(Call> call, Throwable t) { System.out.println("通信失敗:updateOpenList"); System.out.println(t); } @@ -413,11 +413,11 @@ //Maxの更新 public void updateMax() { - Call call = gameRest.getMax(rid, tno); + Call call = gameRest.getMax(rid, tno); - call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()){ if(maxPreData == null){ //初回代入 @@ -434,7 +434,7 @@ } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { System.out.println("通信失敗:updateMax"); System.out.println(t); }