diff --git a/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java index bd90614..552cc07 100644 --- a/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java @@ -80,9 +80,9 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { //ridとnicknameをIrisへ - String rid = response.body().getRid(); + /*String rid = response.body().getRid(); ((Iris) getApplication()).setRid(rid); - ((Iris) getApplication()).setNickname(nickname); + ((Iris) getApplication()).setNickname(nickname);*/ //次の画面へ遷移 Intent intent = new Intent(CreateRoomActivity.this,OwnerRoomActivity.class); startActivity(intent); diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index 98d4be8..71bf3db 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -10,11 +10,16 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; +import org.ntlab.irisclient.models.Member; import org.ntlab.irisclient.resources.RoomsRest; +import org.ntlab.irisclient.viewmodels.RoomViewModel; import java.util.ArrayList; import java.util.Collections; +import java.util.List; import retrofit2.Call; import retrofit2.Callback; @@ -34,6 +39,18 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_owner_room); + //RoomViewModelへのアクセス + RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class); + + //LiveData(List)への購読 + roomViewModel.getMembersLiveData().observe(this, new Observer>() { + private List members; + @Override + public void onChanged(List members) { + + } + }); + //-------------------------------------------------------------------------- //各ボタン処理 ArrayList members = new ArrayList<>(); @@ -170,6 +187,10 @@ //部屋ID情報 TextView RoomIdText = findViewById(R.id.roomID); RoomIdText.setText(r); + + + + roomViewModel.start(500); } /*private getMemberInformation(){