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(), } } - - //酒吧房用 - 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(), 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() } }