diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 38fe66f..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index afde09f..6935caf 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -47,7 +47,7 @@ @Override public void onChanged(Integer dno) { //String keyword = keywords.get(dno); - textKeyword.setText(dno); + textKeyword.setText(""+dno); } }); @@ -56,10 +56,11 @@ @Override public void onChanged(Integer state) { //stateが変わったらゲーム画面へ遷移 - Intent intent = new Intent(DrawingActivity.this, GameMemberActivity.class); - startActivity(intent); + if(state == 3) { + Intent intent = new Intent(DrawingActivity.this, GameMemberActivity.class); + startActivity(intent); + } } - }); //タイマースタート呼び出し drawingStateViewModel.start(500);