diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java index 5ca4db5..0290baa 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java @@ -23,7 +23,6 @@ //フィールド private String rid; - private Iris iris; final private MutableLiveData> membersLiveData; final private MutableLiveData settingsMutableLiveData; final private MutableLiveData stateLiveData; @@ -153,7 +152,7 @@ final RoomsRest roomsRest = retrofit.create(RoomsRest.class); Call call = roomsRest.putMember(rid, nickname, belongs, isMaster); - /*call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()){ @@ -165,7 +164,7 @@ System.out.println("通信失敗:changeBelongsAndMaster"); System.out.println(t); } - });*/ + }); } //メンバー削除 @@ -179,7 +178,7 @@ final RoomsRest roomsRest = retrofit.create(RoomsRest.class); Call call = roomsRest.putState(rid,nickname,2); - /*call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()){ @@ -191,7 +190,7 @@ System.out.println("通信失敗:startDrawing"); System.out.println(t); } - });*/ + }); } //設定情報の変更処理(OwnerActivityのみ) @@ -199,7 +198,7 @@ final RoomsRest roomsRest = retrofit.create(RoomsRest.class); Call call = roomsRest.putSettings(rid, dTimer, dTimerTimes, gTimer, gTimerTimes, gTimerFTTimes); - /*call.enqueue(new Callback() { + call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()){ @@ -211,7 +210,7 @@ System.out.println("通信失敗:changeSettings"); System.out.println(t); } - });*/ + }); } //----------------------------------------------------------------------------- // updates @@ -241,18 +240,18 @@ //配列のサイズが異なるならその時点で並び替えてライブデータ書き換え sortedMembersList = sortMembersList(response.body()); membersLiveData.setValue(sortedMembersList); - //iris.setMemberList(sortedMembersList); membersPreData = sortedMembersList; + iris.setMemberList(sortedMembersList); } else { //配列のサイズが同じ時は比較開始 - if (compareMembers(response.body(), membersPreData)) { + if (compareMembers(sortMembersList(response.body()), membersPreData)) { //比較してtrueなら何もしない } else { //比較してfalseなら並び替えてライブデータ書き換え sortedMembersList = sortMembersList(response.body()); membersLiveData.setValue(sortedMembersList); - //iris.setMemberList(sortedMembersList); membersPreData = sortedMembersList; + iris.setMemberList(sortedMembersList); } } } @@ -260,8 +259,8 @@ //最初のアップデートは無条件でライブデータ書き換え sortedMembersList = sortMembersList(response.body()); membersLiveData.setValue(sortedMembersList); - //iris.setMemberList(sortedMembersList); membersPreData = sortedMembersList; + iris.setMemberList(sortedMembersList); } }