diff --git a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java index fa29a07..d66f0aa 100644 --- a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java @@ -8,9 +8,12 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import org.ntlab.irisclient.models.Member; import org.ntlab.irisclient.resources.GameRest; import org.ntlab.irisclient.resources.RoomsRest; +import java.util.List; + import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -41,25 +44,25 @@ Button ownerButton = findViewById(R.id.ownerdraw); ownerButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - //(ownerのみ)drawtestを更新 : は動かない -/* - Call call = roomsRest.putTestRoom(); - call.enqueue(new Callback() { + ((Iris) getApplication()).setRid("drawtest"); + ((Iris) getApplication()).setNickname("owner"); + ((Iris) getApplication()).setTeam("r"); + ((Iris) getApplication()).setMaster(true); + Call> call = roomsRest.getRoomMember("drawtest"); + 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("通信成功:createDrawTest"); + ((Iris) getApplication()).setMemberList(response.body()); } } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call> call, Throwable t) { System.out.println("通信失敗:createDrawTest"); System.out.println(t); } }); -*/ - ((Iris) getApplication()).setRid("drawtest"); - ((Iris) getApplication()).setNickname("owner"); Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); startActivity(intent); } @@ -71,6 +74,23 @@ public void onClick(View v) { ((Iris) getApplication()).setRid("drawtest"); ((Iris) getApplication()).setNickname("member"); + ((Iris) getApplication()).setTeam("b"); + ((Iris) getApplication()).setMaster(true); + Call> call = roomsRest.getRoomMember("drawtest"); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.isSuccessful()){ + System.out.println("通信成功:createDrawTest"); + ((Iris) getApplication()).setMemberList(response.body()); + } + } + @Override + public void onFailure(Call> call, Throwable t) { + System.out.println("通信失敗:createDrawTest"); + System.out.println(t); + } + }); Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); startActivity(intent); } 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 7705ea9..69345f4 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -28,6 +28,7 @@ final private MutableLiveData hintMutableLiveData; final private MutableLiveData> openListMutableLiveData; final private MutableLiveData maxMutableLiveData; + final private MutableLiveData turnNumberMutableLiveData; final private MutableLiveData> colorMutableLiveData; final private MutableLiveData> opensMutableLiveData; final private MutableLiveData> mapMutableLiveData; @@ -44,6 +45,7 @@ private String hintPreData = null; private List openListPreData = null; private Integer maxPreData = null; + private Integer turnNumberPreData = null; private List opensPreData = null; private Boolean[] QPreData = null; @@ -56,6 +58,7 @@ this.hintMutableLiveData = new MutableLiveData<>(); this.openListMutableLiveData = new MutableLiveData<>(); this.maxMutableLiveData = new MutableLiveData<>(); + this.turnNumberMutableLiveData = new MutableLiveData<>(); this.mapMutableLiveData = new MutableLiveData<>(); this.colorMutableLiveData = new MutableLiveData<>(); this.opensMutableLiveData = new MutableLiveData<>(); @@ -282,6 +285,7 @@ updateHint(); updateOpenList(); updateMax(); + updateTurnNumber(); updateOpens(); updateQ(); } @@ -441,6 +445,36 @@ }); } + //TurnNumberの更新 + public void updateTurnNumber() { + Call call = gameRest.getTurnNumber(rid); + + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()){ + if(turnNumberPreData == null){ + //初回代入 + turnNumberMutableLiveData.setValue(response.body()); + turnNumberPreData = response.body(); + }else if(response.body().equals(turnNumberPreData)){ + //値が一緒なら書き換えない + }else{ + //値が異なるときのみライブデータを上書き + turnNumberMutableLiveData.setValue(response.body()); + turnNumberPreData = response.body(); + } + } + } + + @Override + public void onFailure(Call call, Throwable t) { + System.out.println("通信失敗:updateTurnNumber"); + System.out.println(t); + } + }); + } + //現在開いているすべてのカードを取得([tffftffffftttff]みたいなリストを逐一更新する、マスが開くたびに更新) public void updateOpens() {