diff --git a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java index 10f2116..d1da638 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java @@ -6,15 +6,62 @@ import java.util.List; public class TurnJson { - private String hint; private String team; private int max; - private int turnstate; + private int turnstate; //turn内でスパイマスターと諜報員の操作の切り替えに使用(0:スパイマスター, 1:諜報員) private List openlist = new ArrayList<>(); - //コンストラクタ - public TurnJson() { + //--------------------------------------------------------- + //ゲッター + + public String getHint() { + return hint; } + public String getTeam() { + return team; + } + + public int getMax() { + return max; + } + + public int getTurnstate() {return turnstate;} + + public List getOpenListAll() {return openlist;} //リストそのものを返す。 + + //--------------------------------------------------------- + //セッター + + public void setHint(String hint) { + this.hint = hint; + } + + public void setTeam(String team) { + this.team = team; + } + + public void setMax(int max) { + this.max = max; + } + + public void setTurnstate(int turnstate) {this.turnstate = turnstate;} + + public void putHint(String rid, int tno){ + this.hint = hint; + this.max = max; + } + + //--------------------------------------------------------- + //openlist操作 + + public Integer getOpenListSolo(int num){return openlist.get(num);} + + public void addOpenList(Integer cno){openlist.add(cno);} + + public void delieteOpenList(int num){openlist.remove(num);} + + public int sizeOpenList(){return openlist.size();} + } 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 a28aed9..9794cca 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java @@ -47,7 +47,7 @@ this.rid = rid; } - public void putHint(String rid, int tno, String hint, int max) { + public void putHint(String hint, int max) { this.hint = hint; this.max = max; } @@ -61,6 +61,9 @@ public LiveData getTurnLiveData() { return this.turnMutableLiveData; } + public Integer getTurnNumber(){ + return tno; + } // public Integer getTurnNumber(String rid) { // return tno; // } @@ -73,7 +76,7 @@ updateTurn(rid); } - //ターン数の取得(赤か青のターンの判別) + //r,bの取得(今どちらのチームかの判別) public void updateTurns(String rid) { final GameRest gameRest = retrofit.create(GameRest.class); Call call = gameRest.getTeam(rid);