diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java index de2587a..5d6fc4c 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java @@ -147,7 +147,7 @@ gameViewModel.getImageLiveData().observe( getViewLifecycleOwner(), gameJsonObserver -> { - System.out.println("kota: getImageLiveDataが"); + System.out.println("kota: getImageLiveDataが取得:" + gameJsonObserver); setupWithViewModel(); } ); @@ -236,6 +236,7 @@ } } + return false; } @@ -255,9 +256,12 @@ map = gameViewModel.getGame().getMap(); colorList = gameViewModel.getGame().getColorList(); + System.out.println("adfasfasdfsf"+drawingList); + Context context = getContext(); - for (int i = 0; i < drawingList.size(); i++) { + for (int i = 0; i < 16; i++) { + // タップとロングタップのセット imageButtons[i].setOnClickListener(this::onClick); imageButtons[i].setOnLongClickListener(this::onLongTap); @@ -265,6 +269,7 @@ // 画像のセット String urlSt = drawingList.get(map.get(i)).getDrawing(); + System.out.println(i+urlSt); setImage(i, urlSt, context); // 初回だけセットする外枠の、メンバーとマスターで表示分け 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 df39819..5ef7a69 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/GameRest.java @@ -82,7 +82,7 @@ //----------------------------------------------- @GET("rooms/{rid}/game/turns/{tno}/hint") - Call getHint( + Call getHint( @Path("rid") String rid, @Path("tno") Integer tno ); 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 e27ab73..205eb27 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -371,28 +371,38 @@ //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){ - //初回代入 - hintMutableLiveData.setValue(response.body()); - hintPreData = response.body(); - }else if(response.body().equals(hintPreData)){ + try { + hintMutableLiveData.setValue(response.body().string()); + + hintPreData = hintMutableLiveData.getValue(); + System.out.println("今回のヒントは" + hintPreData + "です(初回)"+hintMutableLiveData.getValue()); + } catch (IOException e) { + e.printStackTrace(); + } + }else if(hintMutableLiveData.getValue().equals(hintPreData)){ //値が一緒なら書き換えない }else{ - //値が異なるときのみライブデータを上書き - hintMutableLiveData.setValue(response.body()); - hintPreData = response.body(); + try { + hintMutableLiveData.setValue(response.body().string()); + hintPreData = hintMutableLiveData.getValue(); + } catch (IOException e) { + e.printStackTrace(); + } + + System.out.println("今回のヒントは" + hintPreData + "です"); } } } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { System.out.println("通信失敗:updateHint"); System.out.println(t); }