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 e0f7b86f..2fbb1664 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
@@ -2309,18 +2309,18 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             if (pendingRoomId == null) {
                 return
             }
-            LogUtils.e("需要加入的房间id：pendingRoomId: $pendingRoomId")
+            LogUtils.e("需要加入的房间id：pendingRoomId: $pendingRoomId  currRoomId:${roomId}")
             roomSwitchRunnable = Runnable {
                 if (!isFinishing && !isDestroyed) {
                     if (pendingRoomId != lastSwitchedRoomId) {
-                        MvpPre!!.quitRoom2(messageEvent.roomId, SpUtil.getUserId().toString() + "")
+                        MvpPre!!.quitRoom2(roomId, SpUtil.getUserId().toString() + "")
                         quit()
-                        MessageListenerSingleton.quitGroup(messageEvent.roomId)
+                        MessageListenerSingleton.quitGroup(pendingRoomId)
                         MessageListenerSingleton.getInstance().joinGroup(pendingRoomId)
+                        AgoraManager.getInstance().lastRoomId = roomId
                         MvpPre!!.getRoomIn(pendingRoomId, "")
                         lastSwitchedRoomId = pendingRoomId!!
-                        AgoraManager.getInstance().lastRoomId =
-                            messageEvent.roomId
+
                     }
                 }
                 pendingRoomId = null