diff --git a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java new file mode 100644 index 0000000..d748aa4 --- /dev/null +++ b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java @@ -0,0 +1,4 @@ +package org.ntlab.irisclient.entities; + +public class TurnJson { +} 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 3e00dab..a306f45 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -1,6 +1,7 @@ package org.ntlab.irisclient.viewmodels; import org.ntlab.irisclient.entities.RoomJson; +import org.ntlab.irisclient.entities.TurnJson; import org.ntlab.irisclient.models.Member; import org.ntlab.irisclient.models.Settings; import org.ntlab.irisclient.resources.RoomsRest; @@ -9,6 +10,8 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import com.squareup.moshi.Json; + import java.util.List; import retrofit2.Call; @@ -22,13 +25,12 @@ //フィールド private String rid; - private String nickname; - private String hints; - private Integer num; - private List map; - final private MutableLiveData> membersLiveData; - final private MutableLiveData roomMutableLiveData; - final private MutableLiveData settingsMutableLiveData; + private Integer turns; + private String hint; + private Integer max; + private Integer openlist; + final private MutableLiveData turnsMutableLiveData; + final private MutableLiveData turnMutableLiveData; final private Retrofit retrofit; //更新比較用フィールド @@ -38,9 +40,8 @@ //------------------------------------------------------------------ //コンストラクタ public GameViewModel() { - this.membersLiveData = new MutableLiveData<>(); - this.roomMutableLiveData = new MutableLiveData<>(); - this.settingsMutableLiveData = new MutableLiveData<>(); + this.turnsMutableLiveData = new MutableLiveData<>(); + this.turnMutableLiveData = new MutableLiveData<>(); this.retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/") .addConverterFactory(JacksonConverterFactory.create()) @@ -55,84 +56,28 @@ //-------------------------------------------------------------- // getter - public LiveData> getMembersLiveData() { - return this.membersLiveData; + public LiveData getTurnsLiveData() { + return this.turnsMutableLiveData; } - public LiveData getRoomLiveData() { - return this.roomMutableLiveData; - } - public LiveData getSettingsLiveData() { - return this.settingsMutableLiveData; + public LiveData getTurnLiveData() { + return this.turnMutableLiveData; } //----------------------------------------------------------------------------- // updates @Override public void update() { - updateRoom(rid); - updateSus(nickname, map); - updateStatus(map); - updateOpen(nickname, map); - updateHints(hints, num); + updateTurns(turns); + updateTurn(hint, max, openlist); } - //部屋の情報の更新(RoomJson) - public void updateRoom(String rid) { - final RoomsRest roomsRest = retrofit.create(RoomsRest.class); - Call> call = roomsRest.getRoomMember(rid); - - call.enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - if (response.isSuccessful()){ - - //membersLiveData.setValue(response.body()); - //membersPreData = response.body(); - - /* - if(response.body().equals(roomJsonPreData)){ - //値が一緒なら書き換えない - }else{ - //値が異なるときのみライブデータを上書き - membersLiveData.setValue(response.body()); - roomJsonPreData = response.body(); - } - */ - - } - } - @Override - public void onFailure(Call> call, Throwable t) { - } - }); - } - - //候補選択情報の更新 - public void updateSus(String nickname, List map) { + //ターン数の取得(赤か青のターンの判別) + public void updateTurns(Integer turns) { final RoomsRest roomsRest = retrofit.create(RoomsRest.class); } - //マスの開閉状況の更新 - public void updateStatus(List map) { + //hint,openlist,maxの取得 + public void updateTurn(String hint, Integer max, Integer openlist) { final RoomsRest roomsRest = retrofit.create(RoomsRest.class); - } - - //誰がどこを開けたかの情報の更新(ログ用?) - public void updateOpen(String nickname, List map) { - final RoomsRest roomsRest = retrofit.create(RoomsRest.class); - - } - - //ヒントの内容(文、数) - public void updateHints(String hints, Integer num) { - final RoomsRest roomsRest = retrofit.create(RoomsRest.class); - - - - } - - - - }