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 0ed9046..8ac9b26 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -40,7 +40,6 @@ //更新比較用フィールド private String turnsPreData = null; - private TurnJson turnPreData = null; private String hintPreData = null; private List openListPreData = null; @@ -54,7 +53,6 @@ //コンストラクタ public GameViewModel() { this.turnsMutableLiveData = new MutableLiveData<>(); - //this.turnMutableLiveData = new MutableLiveData<>(); this.hintMutableLiveData = new MutableLiveData<>(); this.openListMutableLiveData = new MutableLiveData<>(); this.maxMutableLiveData = new MutableLiveData<>(); @@ -71,11 +69,6 @@ .build(); this.gameRest = retrofit.create(GameRest.class); - -// startColor(rid); -// startMap(rid); -// startImage(rid); - } //---------------------------------------------------- @@ -95,13 +88,10 @@ public LiveData getTurnsLiveData() { return this.turnsMutableLiveData; } -// public LiveData getTurnLiveData() { -// return this.turnMutableLiveData; -// } public LiveData getHintLiveData() { return this.hintMutableLiveData; } - public LiveData> getopenListLiveData() { + public LiveData> getOpenListLiveData() { return this.openListMutableLiveData; } public LiveData getmaxLiveData() { @@ -158,39 +148,39 @@ }); } - //現在のTurnstateを送信 - public void sendTurnstate() { + //現在のTurnStateを送信 + public void sendTurnState() { Call call = gameRest.setTurnstate(rid, tno); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()){ - System.out.println("通信成功:sendTurnstate"); + System.out.println("通信成功:sendTurnState"); } } @Override public void onFailure(Call call, Throwable t) { - System.out.println("通信失敗:sendTurnstate"); + System.out.println("通信失敗:sendTurnState"); System.out.println(t); } }); } - //現在のGamestateを送信 - public void sendEndstate() { + //現在のGameStateを送信 + public void sendEndState() { Call call = gameRest.setEndstate(rid, tno); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()){ - System.out.println("通信成功:sendEndstate"); + System.out.println("通信成功:sendEndState"); } } @Override public void onFailure(Call call, Throwable t) { - System.out.println("通信失敗:sendEndstate"); + System.out.println("通信失敗:sendEndState"); System.out.println(t); } }); @@ -281,11 +271,11 @@ // updates @Override public void update() { + updateTurnNumber(); updateTurns(); updateHint(); updateOpenList(); updateMax(); - updateTurnNumber(); updateOpens(); updateQ(); } @@ -348,7 +338,7 @@ @Override public void onFailure(Call call, Throwable t) { - System.out.println("通信失敗:updateTurn.hint no yatsu"); + System.out.println("通信失敗:updateTurn"); System.out.println(t); } }); @@ -457,14 +447,12 @@ //初回代入 turnNumberMutableLiveData.setValue(response.body()); turnNumberPreData = response.body(); - tno = turnNumberPreData; }else if(response.body().equals(turnNumberPreData)){ //値が一緒なら書き換えない }else{ //値が異なるときのみライブデータを上書き turnNumberMutableLiveData.setValue(response.body()); turnNumberPreData = response.body(); - tno = turnNumberPreData; } } } @@ -490,7 +478,7 @@ //初回代入 opensMutableLiveData.setValue(response.body()); opensPreData = response.body(); - }else if(response.body().equals(turnPreData)){ + }else if(response.body().equals(opensPreData)){ //値が一緒なら書き換えない }else{ //値が異なるときのみライブデータを上書き @@ -534,7 +522,7 @@ @Override public void onFailure(Call call, Throwable t) { - System.out.println("通信失敗:updateTurn.hint no yatsu"); + System.out.println("通信失敗:updateQ"); System.out.println(t); } });