diff --git a/app/src/main/java/org/ntlab/irisclient/models/Room.java b/app/src/main/java/org/ntlab/irisclient/models/Room.java index 41f0337..ccd7b4a 100644 --- a/app/src/main/java/org/ntlab/irisclient/models/Room.java +++ b/app/src/main/java/org/ntlab/irisclient/models/Room.java @@ -1,7 +1,5 @@ package org.ntlab.irisclient.models; -import android.app.Application; -import android.content.SharedPreferences; import java.util.ArrayList; import java.util.HashMap; @@ -80,15 +78,5 @@ } //-------------------------------------------------------------- - //その他メソッド - public void deleteMember(String nick) { - members.remove(nick); - } - - public void addMember(String nick) { - Member m=new Member(nick); - m.setNickname(nick); - members.put(nick,m); - } } diff --git a/app/src/main/java/org/ntlab/irisclient/resources/RoomRest.java b/app/src/main/java/org/ntlab/irisclient/resources/RoomRest.java deleted file mode 100644 index d737356..0000000 --- a/app/src/main/java/org/ntlab/irisclient/resources/RoomRest.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.ntlab.irisclient.resources; - -import org.ntlab.irisclient.models.Member; -import org.ntlab.irisclient.models.Room; -import org.ntlab.irisclient.models.Settings; - -import java.util.List; - -import retrofit2.Call; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.GET; -import retrofit2.http.PUT; -import retrofit2.http.Path; -import retrofit2.http.Query; - -public interface RoomRest { - - //--------------------------------------------------------------- - //roomの情報を取得する(メンバーリスト、ゲーム設定、部屋番号) - @GET("rooms/{rid}") - Call getRoomInformation( - @Path("rid")String rid - ); - - //--------------------------------------------------------------- - //ゲームを始める(オーナーのみ) - @FormUrlEncoded - @PUT("room/{rid}/state") - Call startGame( - @Path("rid")String rid, - @Field("nickname")String nickname, - @Field("state")Integer state - ); - -} \ No newline at end of file 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 562e480..7b924f7 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java @@ -1,12 +1,7 @@ package org.ntlab.irisclient.viewmodels; -import android.util.Log; - -import org.ntlab.irisclient.models.Room; -import org.ntlab.irisclient.models.Settings; -import org.ntlab.irisclient.resources.RoomRest; - -import java.net.URI; +import org.ntlab.irisclient.entities.RoomJson; +import org.ntlab.irisclient.resources.RoomsRest; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -16,12 +11,11 @@ import retrofit2.Callback; import retrofit2.Response; import retrofit2.Retrofit; -import retrofit2.converter.moshi.MoshiConverterFactory; import retrofit2.converter.jackson.JacksonConverterFactory; public class RoomViewModel extends ViewModel { - private MutableLiveData roomMutableLiveData; + private MutableLiveData roomMutableLiveData; private Retrofit retrofit; //------------------------------------------------ @@ -36,26 +30,48 @@ //----------------------------------------------------------------- // getter - public LiveData getLiveData() { + public LiveData getLiveData() { return this.roomMutableLiveData; } //----------------------------------------------------------------- - // update - public void update(String rid) { - final RoomRest roomRest = retrofit.create(RoomRest.class); + // updates + //メンバーの更新、設定情報の更新 + public void updateMembers(String rid) { + final RoomsRest roomsRest = retrofit.create(RoomsRest.class); - Call call = roomRest.getRoomInformation(rid); - call.enqueue(new Callback() { + Call call = roomsRest.getRoomMember(rid); + + call.enqueue(new Callback() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call call, Response response) { if (response.isSuccessful()){ roomMutableLiveData.setValue(response.body()); } } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call call, Throwable t) { + + } + }); + } + + public void updateSettings(String rid) { + final RoomsRest roomsRest = retrofit.create(RoomsRest.class); + + Call call = roomsRest.getSettings(rid); + + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()){ + roomMutableLiveData.setValue(response.body()); + } + } + + @Override + public void onFailure(Call call, Throwable t) { } });