diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index fc9b7c3..c1cf82d 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -16,20 +16,21 @@ public class DrawingActivity extends AppCompatActivity implements View.OnClickListener { private DrawingCanvas drawingCanvas; - DrawingStateViewModel drawingStateViewModel = new ViewModelProvider(this).get(DrawingStateViewModel.class); + private DrawingStateViewModel drawingStateViewModel; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_drawing); - drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas); + // drawingCanvas = (DrawingCanvas) findViewById(R.id.canvas); //Irisから必要な情報を取得 Iris iris = (Iris) this.getApplication(); String rid = iris.getRid(); String nickName = iris.getNickname(); + drawingStateViewModel= new ViewModelProvider(this).get(DrawingStateViewModel.class); //viewModelに必用な情報をセット drawingStateViewModel.setRid(rid); drawingStateViewModel.setNickName(nickName); @@ -38,14 +39,14 @@ TextView textKeyword =(TextView)findViewById(R.id.textKeyword);//keywordのTextView //getKeywords - List keywords = drawingStateViewModel.getKeywords(rid); + //List keywords = drawingStateViewModel.getKeywords(rid); //getDno drawingStateViewModel.getDno().observe(this, new Observer() { @Override public void onChanged(Integer dno) { - String keyword = keywords.get(dno); - textKeyword.setText(keyword); + //String keyword = keywords.get(dno); + //textKeyword.setText(keyword); } }); diff --git a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java index b5c51d3..5d62adb 100644 --- a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java @@ -74,7 +74,7 @@ ((Iris) getApplication()).setNickname(name); Intent intent = new Intent(EnterRoomActivity.this,MemberRoomActivity.class); - //intent.putExtra("nickname", name); + intent.putExtra("nickname", name); startActivity(intent); }else { Snackbar.make(v, "部屋に同名のプレイヤーがいるか,満席です", Snackbar.LENGTH_LONG).show(); diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java index 9a73037..90383d1 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -48,13 +48,15 @@ String nickname = ((Iris) getApplication()).getNickname(); //自分のなまえ - //Intent intentMain = getIntent(); - //myName = intentMain.getStringExtra("nickname"); + Intent intentMain = getIntent(); + myName = intentMain.getStringExtra("nickname"); //-------------------------------------------------------------------------- //RoomViewModelへのアクセス RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class); + roomViewModel.setRid(roomId); + //LiveData(List)への購読 roomViewModel.getMembersLiveData().observe(this, new Observer>() { private List members; @@ -89,21 +91,15 @@ m2.setBelongs("b"); m2.setMaster(true); - Member m3 = new Member("m3"); - m2.setBelongs("r"); - m2.setMaster(false); - Member m4 = new Member("m4"); - m2.setBelongs("b"); - m2.setMaster(false); - Member m5 = new Member("m5"); - m2.setBelongs("r"); - m2.setMaster(false); + Member mn = new Member(myName); + mn.setBelongs("g"); + mn.setMaster(false); members.add(m1.getNickname()); members.add(m2.getNickname()); - members.add(m3.getNickname()); - members.add(m4.getNickname()); - members.add(m5.getNickname()); + + members.add(mn.getNickname()); + ListView membersList = (ListView) findViewById(R.id.MembersList); 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 d748aa4..d96fc70 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/TurnJson.java @@ -1,4 +1,60 @@ package org.ntlab.irisclient.entities; +import java.util.ArrayList; +import java.util.List; + public class TurnJson { + + private String hint; + private String team; + private int max; + //private List openlist = new ArrayList<>(); + + //コンストラクタ + public TurnJson() { + } + + //--------------------------------------------------------- + //ゲッター + + public String getHint() { + return hint; + } + + public String getTeam() { + return team; + } + + public int getMax() { + return max; + } + + //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; + } + + //--------------------------------------------------------- + //openlist操作 +/* + public Cell getOpenListSolo(int num){return openlist.get(num);} + + public void addOpenList(Cell card){openlist.add(card);} + + 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/DrawingStateViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java index 034be15..64d51ea 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java @@ -26,14 +26,13 @@ final private MutableLiveData stateMutableLiveData=new MutableLiveData<>(); final private MutableLiveData dnoMutableLiveData=new MutableLiveData<>(); final private Retrofit retrofit; - private Integer drawingStatePreData; private Integer dnoPreData; private String rid; private String nickName; //フィールド - public DrawingStateViewModel(MutableLiveData stateMutableLiveData) { + public DrawingStateViewModel() { this.retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/") .addConverterFactory(JacksonConverterFactory.create()) @@ -98,9 +97,7 @@ } public List getKeywords(String rid){ - final DrawingRest drawingRest = retrofit.create(DrawingRest.class); - List call = (List) drawingRest.getKeywords(rid); - return call; + return null; } public LiveData getDno(){ return this.dnoMutableLiveData; diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml index db68bde..55763c7 100644 --- a/app/src/main/res/layout/activity_drawing.xml +++ b/app/src/main/res/layout/activity_drawing.xml @@ -8,50 +8,74 @@