diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java index 025f244..9a902e2 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java @@ -121,14 +121,6 @@ (ImageView) view.findViewById(R.id.backColour15) }; - System.out.println("コンストラクタでのログ確認"); - System.out.println("kota: isMasterかどうか:" + isMaster); - System.out.println("kota: getrid:" + iris.getRid()); - System.out.println("kota: getteame:" + iris.getTeam()); - System.out.println("kota: getMemberList:" + iris.getMemberList()); - System.out.println("kota: getNickName:" + iris.getNickname()); - System.out.println("kota: getImageLiveData:" + gameViewModel.getImageLiveData().getValue()); - gameViewModel.getImageLiveData().observe( getViewLifecycleOwner(), gameJsonObserver -> { @@ -154,6 +146,14 @@ } ); + System.out.println("コンストラクタでのログ確認"); + System.out.println("kota: isMasterかどうか:" + isMaster); + System.out.println("kota: getrid:" + iris.getRid()); + System.out.println("kota: getteame:" + iris.getTeam()); + System.out.println("kota: getMemberList:" + iris.getMemberList()); + System.out.println("kota: getNickName:" + iris.getNickname()); + System.out.println("kota: getImageLiveData:" + gameViewModel.getImageLiveData().getValue()); + return view; } @@ -340,6 +340,7 @@ } else if (colorList.get(i).contains("d")) { backColors[i].setBackground(resources.getDrawable(R.drawable.black_image)); imageButtons[i].setVisibility(View.INVISIBLE); + gameViewModel.sendEndState(); finishGameAlertMake(i, myTeam, nowTurn); } setAnime(i); @@ -421,6 +422,8 @@ **/ private void setDoubt(int cno, boolean isOK) { // 疑う処理 + // 実はまだViewは書けてない + gameViewModel.sendQ(cno); } /** 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 0a79ef0..b64ecc2 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -90,6 +90,9 @@ public LiveData getTurnsLiveData() { return this.turnsMutableLiveData; } + public LiveData getTurnStateLiveData() { + return this.turnStateMutableLiveData; + } public LiveData getHintLiveData() { return this.hintMutableLiveData; } @@ -311,7 +314,7 @@ @Override public void onFailure(Call call, Throwable t) { - System.out.println("通信失敗:updateTurns"); + System.out.println("通信失敗:updateTurns " + turnsPreData + "です"); System.out.println(t); } });