diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6168258..08f679c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,13 +20,7 @@
-
-
-
-
-
-
+ android:screenOrientation="landscape" />
+ android:screenOrientation="landscape" >
+
+
+
+
+
+
> membersLiveData;
final private MutableLiveData settingsMutableLiveData;
+ final private MutableLiveData stateLiveData;
final private Retrofit retrofit;
//更新比較用フィールド
@@ -34,6 +35,7 @@
public RoomViewModel() {
this.membersLiveData = new MutableLiveData<>();
this.settingsMutableLiveData = new MutableLiveData<>();
+ this.stateLiveData = new MutableLiveData<>();
this.retrofit = new Retrofit.Builder()
.baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
.addConverterFactory(JacksonConverterFactory.create())
@@ -52,6 +54,9 @@
public LiveData getSettingsLiveData() {
return this.settingsMutableLiveData;
}
+ public LiveData getStateLiveData() {
+ return this.stateLiveData;
+ }
//-----------------------------------------------------------------------------
// updates
@@ -59,9 +64,10 @@
public void update(){
updateMembers(rid);
updateSettings(rid);
+ updateState(rid);
}
- //部屋の情報の更新(RoomJson)
+ //部屋の情報の更新(List)
public void updateMembers(String rid) {
final RoomsRest roomsRest = retrofit.create(RoomsRest.class);
@@ -124,4 +130,34 @@
}
});
}
+
+ //部屋の状態情報の更新(Integer)
+ public void updateState(String rid) {
+ final RoomsRest roomsRest = retrofit.create(RoomsRest.class);
+ Call call = roomsRest.getState(rid);
+
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(Call call, Response response) {
+ if (response.isSuccessful()){
+
+ stateLiveData.setValue(response.body());
+
+ /*
+ if(response.body().equals(settingsPreData)){
+ //値が一緒なら書き換えない
+ }else{
+ //値が異なるときのみライブデータを上書き
+ settingsMutableLiveData.setValue(response.body());
+ settingsPreData = response.body();
+ }*/
+
+ }
+ }
+
+ @Override
+ public void onFailure(Call call, Throwable t) {
+ }
+ });
+ }
}