diff --git a/.idea/misc.xml b/.idea/misc.xml index 049e2a8..f386631 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,8 @@ - + + diff --git a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java index 67eeb76..8587791 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java @@ -1,4 +1,45 @@ package org.ntlab.irisclient.entities; +import java.util.List; public class MemberJson { + private String nickname; + private String belongs; + private boolean master; + + + public MemberJson(String nickname) { + this.nickname = nickname; + this.belongs = "n"; + this.master = false; + } + + //------------------------------------- + // setter + public void setNickname(String nickname){ + this.nickname = nickname; + } + + public void setBelongs(String belongs){ + this.belongs = belongs; + } + + public void setMaster(boolean master){ + this.master = master; + } + + //--------------------------------------- + // getter + + public String getNickname(){ + return this.nickname; + } + + public String getBelongs(){ + return this.belongs; + } + + public boolean isMaster(){ + return this.master; + } + } 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 427716b..708b405 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java @@ -1,4 +1,103 @@ package org.ntlab.irisclient.entities; +import android.provider.Settings; + +import java.lang.reflect.Member; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class RoomJson { -} + + //フィールド + public String rid; + private int state; + public String ownerName; + Map members= new HashMap<>(); + Settings settings = new Settings(); + //Game game = null; + private Member redMaster; + private Member blueMaster; + + //-------------------------------------------------------------- + public RoomJson(String rid, String owner) { + this.rid = rid; + ownerName = owner; + } + + //-------------------------------------------------------------- + //getter + public String getRid(){ + return rid; + } + + public String getOwnerName() { + return ownerName; + } + + public Settings getSettings() { + return settings; + } + + public List getMembers() { + List memberslist = new ArrayList(members.values()) ; + return memberslist; + } + + + public Member getRedMaster() { + return redMaster; + } + + public Member getBlueMaster() { + return blueMaster; + } + + + public Member getMember(String nick) { + Member m = members.get(nick); + return m; + } + + public void deleteMember(String nick) { + members.remove(nick); + } + + public int getState() { + return state; + } + + + + + + //-------------------------------------------------------------- + //setter + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } + + public Member setMember(String nick) { + Member m = members.get(nick); + return m; + } + + public void setRedMaster(Member redMaster) { + this.redMaster = redMaster; + } + + public void setBlueMaster(Member blueMaster) { + this.blueMaster = blueMaster; + } + + public Settings setSettings() { + return settings; + } + + + + //-------------------------------------------------------------- + + +} \ No newline at end of file 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 cfc2bb0..1aab2fd 100644 --- a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java +++ b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java @@ -42,7 +42,7 @@ // ランダムなチーム編成を行うメソッド @FormUrlEncoded @PUT("rooms/{rid}/members") - Call> putMembers( + Call putMembers( @Path("rid") String rid, @Field("nickname") String nickname ); @@ -51,7 +51,7 @@ //自分のニックネームを送り、部屋に参加するメソッド @FormUrlEncoded @POST("rooms/{rid}/members") - Call> postMembers( + Call postMembers( @Path("rid") String rid, @Field("nickname") String nickname );