From 54b3312eac775f6debdbbb560f9a4b39b9a8e39d Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 9 Jan 2026 11:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E4=BA=A4=E5=8F=8B=E6=88=BF?=
 =?UTF-8?q?=20=E6=B6=88=E6=81=AF=E6=8E=A5=E6=94=B6=E9=87=8D=E7=BD=AE=202?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/activity/RoomActivity.kt    | 25 +++++++++++++------
 .../room/fragment/RoomPrivateFragment.kt      |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

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 d722a60d..73df89c2 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
@@ -1820,14 +1820,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             }
         }
 
-
-        //酒吧房用
-        if (publicScreenFragment != null) {
-            publicScreenFragment?.mIsPriRoom = false
-            publicScreenFragment?.clearExMessageListener()
-            publicScreenFragment?.setIsPriRoom(false)
-        }
-
         CommonAppContext.getInstance().isMai = false
 
         CommonAppContext.getInstance().onlineMap.clear()
@@ -3930,6 +3922,23 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         AgoraManager.getInstance().lastRoomId = ""
     }
 
+    /** 酒吧房交友房退出 */
+    fun jiaPrivateR() {
+        LogUtils.e(
+            "@@@",
+            "上一个房间的roonid" + AgoraManager.getInstance().lastRoomId
+        )
+        //酒吧房用
+        if (publicScreenFragment != null) {
+            publicScreenFragment?.mIsPriRoom = false
+            publicScreenFragment?.clearExMessageListener()
+            publicScreenFragment?.setIsPriRoom(false)
+        }
+        MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "")
+        AgoraManager.getInstance().lastRoomId = ""
+    }
+
+
     override fun userGuanzSuccess(s: String) {
         if (mRoomUserBean!!.is_collect == 1) {
             mRoomUserBean!!.is_collect = 0
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt
index bfbcff53..0371dffb 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt
@@ -246,7 +246,7 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) :
             )
             MessageExListenerSingleton.quitGroup(mRoomId)
             (activity as RoomActivity).quit()
-            (activity as RoomActivity).jiaR()
+            (activity as RoomActivity).jiaPrivateR()
         }
     }