diff --git a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java index 1a45425..b5c51d3 100644 --- a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java @@ -69,11 +69,12 @@ public void onResponse(Call call, Response response) { if(response.isSuccessful()){ - /*String responseRid = response.body().getRid(); - ((Iris) getApplication()).setRid(responseRid);*/ + String responseRid = response.body().getRid(); + ((Iris) getApplication()).setRid(responseRid); + ((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 9315482..5d1ba71 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -30,8 +30,7 @@ ArrayList members = new ArrayList<>(); String r = "roomid"; String myName = "null"; - //String roomId = ((Iris) getApplication()).getRid(); - //private RoomViewModel roomViewModel; + private RoomViewModel roomViewModel; @@ -41,6 +40,9 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_member_room); + String roomId = ((Iris) getApplication()).getRid(); + String nickname = ((Iris) getApplication()).getNickname(); + //自分のなまえ //Intent intentMain = getIntent(); //myName = intentMain.getStringExtra("nickname"); diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index 71bf3db..67b9399 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -31,14 +31,15 @@ //フィールド String r = "部屋ID " + "123456"; - String nickname = ((Iris) getApplication()).getNickname(); - String rid = ((Iris) getApplication()).getRid(); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_owner_room); + String nickname = ((Iris) getApplication()).getNickname(); + String rid = ((Iris) getApplication()).getRid(); + //RoomViewModelへのアクセス RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class);