diff --git a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java index 959eb9e..02743a0 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java @@ -1,19 +1,19 @@ package org.ntlab.irisclient.entities; -import android.provider.Settings; import org.ntlab.irisclient.models.Member; -import org.ntlab.irisclient.models.Room; + import java.util.ArrayList; -import java.util.List; +import java.util.Collection; public class RoomJson { //フィールド private String rid; - private int state; + private Integer state; private String ownerName; - List members = new ArrayList<>(); + //List members = new ArrayList<>(); + //private ArrayList members = new ArrayList<>(); //-------------------------------------------------------------- public RoomJson(){ @@ -23,10 +23,28 @@ //getter public String getRid() {return this.rid;} - public int getState() {return this.state;} + public Integer getState() {return this.state;} public String getOwnerName() {return this.ownerName;} - public List getMembers() {return this.members;} + //public Collection getMembers() {return this.members;} + + //-------------------------------------------------------------- + //setter + public void setRid(String rid) { + this.rid = rid; + } + + public void setState(Integer state) { + this.state = state; + } + + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } + +// public void setMembers(ArrayList members){ +// this.members = members; +// } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/models/Member.java b/app/src/main/java/org/ntlab/irisclient/models/Member.java index e6250f6..dc0f65e 100644 --- a/app/src/main/java/org/ntlab/irisclient/models/Member.java +++ b/app/src/main/java/org/ntlab/irisclient/models/Member.java @@ -9,11 +9,22 @@ //----------------------------------------------------------------- //コンストラクト + public Member() { + } public Member(String nickname) { this.nickname = nickname; this.belongs = "n"; this.master = false; } + //----------------------------------------------------------------- + // getter + public String getNickname() {return this.nickname;} + + public String getBelongs() {return this.belongs;} + + public boolean getMaster() {return this.master;} + + public boolean isMaster() {return this.master;} //----------------------------------------------------------------- // setter @@ -23,12 +34,6 @@ public void setMaster(boolean master) {this.master = master;} - //----------------------------------------------------------------- - // getter - public String getNickname() {return this.nickname;} - public String getBelongs() {return this.belongs;} - - public boolean getMaster() {return this.master;} } diff --git a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java index ec4a8f8..e31ed7b 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java @@ -1,9 +1,8 @@ package org.ntlab.irisclient.resources; -import org.ntlab.irisclient.entities.MemberJson; import org.ntlab.irisclient.entities.RoomJson; import org.ntlab.irisclient.models.Settings; - +import org.ntlab.irisclient.models.Member; import java.util.List; import retrofit2.Call; @@ -28,7 +27,7 @@ //----------------------------------------------- // メンバー情報を取得するメソッド @GET("rooms/{rid}") - Call getRoomMember( + Call> getRoomMember( @Path("rid") String rid ); 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 0eb7e41..10f4836 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java @@ -1,6 +1,7 @@ package org.ntlab.irisclient.viewmodels; import org.ntlab.irisclient.entities.RoomJson; +import org.ntlab.irisclient.models.Member; import org.ntlab.irisclient.models.Settings; import org.ntlab.irisclient.resources.RoomsRest; @@ -8,6 +9,8 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import java.util.List; + import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -51,25 +54,25 @@ public void updateRoom(String rid) { final RoomsRest roomsRest = retrofit.create(RoomsRest.class); - Call call = roomsRest.getRoomMember(rid); + Call> call = roomsRest.getRoomMember(rid); - call.enqueue(new Callback() { + call.enqueue(new Callback>() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(Call> call, Response> response) { if (response.isSuccessful()){ if(response.body().equals(roomJsonPreData)){ //値が一緒なら書き換えない }else{ //値が異なるときのみライブデータを上書き - roomMutableLiveData.setValue(response.body()); - roomJsonPreData = response.body(); + roomMutableLiveData.setValue((RoomJson) response.body()); + roomJsonPreData = (RoomJson) response.body(); } } } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(Call> call, Throwable t) { } }); }