diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 73df89c2..feb02443 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1612,7 +1612,7 @@ class RoomActivity : BaseMvpActivity(), if (publicScreenFragment != null) { MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id) publicScreenFragment?.setupExMessageListener() - publicScreenFragment?.setIsPriRoom(true) + publicScreenFragment?.setIsPriRoom(true, arrayListOf(messageEvent.text.user_id,messageEvent.text.meet_user_id)) } } }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomPush) {//酒吧房抱麦推送 @@ -3932,7 +3932,7 @@ class RoomActivity : BaseMvpActivity(), if (publicScreenFragment != null) { publicScreenFragment?.mIsPriRoom = false publicScreenFragment?.clearExMessageListener() - publicScreenFragment?.setIsPriRoom(false) + publicScreenFragment?.setIsPriRoom(false, arrayListOf()) } MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "") AgoraManager.getInstance().lastRoomId = "" diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java index 95c14eba..47dc455b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java @@ -298,9 +298,10 @@ public class ChatRoomFragment extends BaseMvpFragment userIdList) { if (easeChatAdapter != null) { easeChatAdapter.isPriRoom = isPriRoom; + easeChatAdapter.userIdList = userIdList; easeChatAdapter.notifyDataSetChanged(); } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java index 0762d85f..d8a3e52b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java @@ -71,6 +71,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter userIdList = new ArrayList<>(); public EaseChatAdapter() { super(null); @@ -205,7 +206,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter