diff --git a/app/src/main/java/com/example/sprout/refactor/util/PreferenceUtil.java b/app/src/main/java/com/example/sprout/refactor/util/PreferenceUtil.java index 825915f..c384253 100644 --- a/app/src/main/java/com/example/sprout/refactor/util/PreferenceUtil.java +++ b/app/src/main/java/com/example/sprout/refactor/util/PreferenceUtil.java @@ -27,6 +27,7 @@ public enum Key { REGISTERED, // アカウント登録済みかどうか USER_ID, // ユーザーid + MEMBER_ID, // メンバーid サーバ側でのRoom.MemberListの順番 ROOM_ID // ルームid } diff --git a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java index 6640fa9..8c08de5 100644 --- a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java +++ b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java @@ -32,6 +32,7 @@ @Override public void notify(RoomResponse roomResponse) { PreferenceUtil.getInstance().saveInt(PreferenceUtil.Key.ROOM_ID, roomResponse.getRoom().getRoomId()); + PreferenceUtil.getInstance().saveInt(PreferenceUtil.Key.MEMBER_ID, roomResponse.getMemberId()); viewContract.showShortToast("ルームを作成しました"); viewContract.startActivity(ActivityEvent.ROOM_MAIN); viewContract.finishActivity(); diff --git a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomListViewModel.java b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomListViewModel.java index 33173a9..9d4acff 100644 --- a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomListViewModel.java +++ b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomListViewModel.java @@ -66,6 +66,7 @@ public void notify(RoomResponse roomResponse) { if (roomResponse.canEnter()) { PreferenceUtil.getInstance().saveInt(PreferenceUtil.Key.ROOM_ID, roomResponse.getRoom().getRoomId()); + PreferenceUtil.getInstance().saveInt(PreferenceUtil.Key.MEMBER_ID, roomResponse.getMemberId()); viewContract.startActivity(ActivityEvent.ROOM_MAIN); } else { viewContract.showShortToast("入室に失敗しました"); diff --git a/app/src/main/java/com/example/sprout/refactor/vo/Member.java b/app/src/main/java/com/example/sprout/refactor/vo/Member.java new file mode 100644 index 0000000..40b196c --- /dev/null +++ b/app/src/main/java/com/example/sprout/refactor/vo/Member.java @@ -0,0 +1,33 @@ +package com.example.sprout.refactor.vo; + +/** + * ルームのEntity + */ +public class Member { + + private int userId = -1; + private String userName = ""; + private int memberId = -1; + private int role = -1; + private boolean ready = false; + + public int getUserId() { + return userId; + } + + public String getUserName() { + return userName; + } + + public int getMemberId() { + return memberId; + } + + public int getRole() { + return role; + } + + public boolean isReady() { + return ready; + } +} diff --git a/app/src/main/java/com/example/sprout/refactor/vo/Room.java b/app/src/main/java/com/example/sprout/refactor/vo/Room.java index 68217c4..54974cb 100644 --- a/app/src/main/java/com/example/sprout/refactor/vo/Room.java +++ b/app/src/main/java/com/example/sprout/refactor/vo/Room.java @@ -1,7 +1,5 @@ package com.example.sprout.refactor.vo; -import com.example.sprout.rooms.Member; - import java.util.HashMap; /**