From 36fbc88f21d82ec28aadbf8974b2fa8d8b470c2c Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 9 Jan 2026 11:03:12 +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=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/activity/RoomActivity.kt    |   7 +
 .../room/fragment/ChatRoomFragment.java       |   7 +
 .../activity/room/fragment/RoomFragment.java  | 135 +++++++++---------
 .../room/fragment/RoomPrivateFragment.kt      |  51 +++----
 4 files changed, 106 insertions(+), 94 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 778e6f91..cb02a2bd 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
@@ -1592,6 +1592,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatious) { //酒吧房撩ta推送的信息
             roomFragment?.handleRoomMessage(messageEvent)
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoom) {//酒吧房约她进入小黑屋
+
+            LogUtils.e("QXRoomMessageTypeFlirtatiousRoom", "酒吧房约她进入小黑屋:"+messageEvent.text.room_id+"----------------"+mRoomInfoResp?.room_info?.room_id)
+            if (mRoomInfoResp?.room_info?.room_id.equals(messageEvent.text.room_id)){
+                return
+            }
+
             if (mRoomInfoResp?.user_info?.user_id.toString() == messageEvent.text.user_id
                 || mRoomInfoResp?.user_info?.user_id.toString() == messageEvent.text.meet_user_id
             ) {
@@ -2289,6 +2295,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         //酒吧房用
         if (publicScreenFragment != null) {
             publicScreenFragment?.mIsPriRoom = false
+            publicScreenFragment?.clearExMessageListener()
             publicScreenFragment?.setIsPriRoom(false)
         }
     }
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 734b3948..95c14eba 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
@@ -195,6 +195,13 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
         MessageExListenerSingleton.getInstance().addPublicScreenMessageListener(messageExListener);
     }
 
+    public void clearExMessageListener() {
+        if (messageExListener != null) {
+            MessageExListenerSingleton.getInstance().removePublicScreenMessageListener(messageExListener);
+            messageListener = null;
+        }
+    }
+
     /**
      * 检查并处理缓存的消息
      */
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
index b8e88ce8..899af124 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
@@ -182,6 +182,8 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         }
     }
 
+
+
     /**
      * 安全释放所有子 Fragment
      */
@@ -192,7 +194,6 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
             if (!fragments.isEmpty()) {
                 for (Fragment fragment : fragments) {
                     if (fragment == null) continue;
-
                     // 调用各子 Fragment 的释放方法
                     if (fragment instanceof SingSongFragment) {
                         ((SingSongFragment) fragment).releaseResources();
@@ -215,6 +216,8 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                         mentorShipFragment = null;
                     } else if (fragment instanceof RoomPubFragment) {
                         roomPubFragment = null;
+                    }else if (fragment instanceof RoomPrivateFragment) {
+                        roomPrivateFragment = null;
                     }
 
                     // 安全 remove
@@ -262,70 +265,6 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
     }
 
 
-    public void updateChildFragmentViews() {
-        // 使用弱引用避免内存泄漏
-        if (getActivity() == null || !isAdded()) {
-            return;
-        }
-        if (mRoomInfoResp != null && mRoomInfoResp.getRoom_info() != null) {
-            String typeId = mRoomInfoResp.getRoom_info().getType_id();
-            String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
-            RoomType roomType = RoomType.Companion.fromTypeId(typeId);
-
-            mRoomActivity.isInAuctionTopBtVisible(false);
-
-            if (roomType == RoomType.MUTUAL_ENTERTAINMENT) {
-                if (friendshipRoomFragment == currentFragment && friendshipRoomFragment.isAdded()) {
-                    friendshipRoomFragment.roomInfoUpdate(mRoomInfoResp);
-                }
-            } else if (roomType == RoomType.AUCTION) {
-                mRoomActivity.isInAuctionTopBtVisible(true);
-                if (roomAuctionFragment == currentFragment && roomAuctionFragment.isAdded()) {
-                    roomAuctionFragment.roomInfoUpdate(mRoomInfoResp);
-                }
-            } else if (roomType == RoomType.DATING && labelId.equals("2")) {
-                switch (labelId) {
-                    case "2":
-                        if (ktvFragment == currentFragment && ktvFragment.isAdded()) {
-                            ktvFragment.roomInfoUpdate(mRoomInfoResp);
-                        }
-                        break;
-                    case "1":
-                        if (singSongFragment == currentFragment && singSongFragment.isAdded()) {
-                            singSongFragment.roomInfoUpdate(mRoomInfoResp);
-                        }
-                        break;
-                }
-            } else if (roomType == RoomType.BLACK_ROOM) {
-                if (labelId.equals("11")){
-                    if (roomPrivateFragment == currentFragment && roomPrivateFragment.isAdded()) {
-                        roomPrivateFragment.roomInfoUpdate(mRoomInfoResp);
-                    }
-                }else {
-                    if (roomCabinFragment == currentFragment && roomCabinFragment.isAdded()) {
-                        roomCabinFragment.roomInfoUpdate(mRoomInfoResp);
-                    }
-                }
-            } else if (roomType == RoomType.JUKEBOX) {
-                if (roomJukeboxFragment == currentFragment && roomJukeboxFragment.isAdded()) {
-                    roomJukeboxFragment.roomInfoUpdate(mRoomInfoResp);
-                }
-            } else if (roomType == RoomType.SIGN_CONTRACT) {
-                if (mentorShipFragment == currentFragment && mentorShipFragment.isAdded()) {
-                    mentorShipFragment.roomInfoUpdate(mRoomInfoResp);
-                }
-            } else if (roomType == RoomType.PUB_ROOM) {
-                if (roomPubFragment == currentFragment && roomPubFragment.isAdded()) {
-                    roomPubFragment.roomInfoUpdate(mRoomInfoResp);
-                }
-            }else if (roomType == RoomType.PRIVATE_ROOM) {
-                if (roomPrivateFragment == currentFragment && roomPrivateFragment.isAdded()) {
-                    roomPrivateFragment.roomInfoUpdate(mRoomInfoResp);
-                }
-            }
-        }
-    }
-
     /// 给子fragment传递参数
     public void updateFriendshipState(int status, int friend_id, long end_time, FriendUserBean friendshipUserBean) {
         if (friendshipRoomFragment == currentFragment && friendshipRoomFragment.isAdded()) {
@@ -469,8 +408,8 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         }
 
         if (newFragment != null) {
-//            switchFragment(newFragment, mBinding.roomItem.getId(), false);
             performFragmentReplacementReplace(newFragment);
+            performFragmentReplacement(newFragment);
         } else {
             LogUtils.e("newFragment==null");
         }
@@ -501,6 +440,8 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
     }
 
     private Fragment currentFragment = null;
+
+    private Fragment oldFragment = null;
     @SuppressLint("CheckResult")
     private void performFragmentReplacementReplace(Fragment newFragment) {
         if (getActivity() != null && getActivity() instanceof RoomActivity) {
@@ -516,7 +457,6 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         }
 
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-
         // 动画（可选，不想动画可以删掉）
         transaction.setCustomAnimations(
                 com.xscm.moduleutil.R.anim.a_slide_right_in,
@@ -532,7 +472,12 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         transaction.commitAllowingStateLoss();
 
         // 更新当前 fragment 引用
-        currentFragment = newFragment;
+        if (currentFragment == null) {
+            currentFragment = newFragment;
+        }else {
+            oldFragment = currentFragment;
+            currentFragment = newFragment;
+        }
 
         // 延迟启动透明 Activity（保持原逻辑）
         Observable.timer(1000, TimeUnit.MILLISECONDS)
@@ -541,9 +486,61 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                     if (ActivityUtils.getTopActivity() instanceof RoomActivity)
                         startActivity(new Intent(ActivityUtils.getTopActivity(), TransparentActivity.class));
                 });
+//        releaseOldFragment();
     }
 
-    @SuppressLint("CheckResult")
+    private void releaseOldFragment() {
+        if (oldFragment == null)
+            return;
+        if (oldFragment instanceof SingSongFragment) {
+            ((SingSongFragment) oldFragment).releaseResources();
+            singSongFragment = null;
+        }
+
+        if (oldFragment instanceof RoomKtvFragment) {
+            ((RoomKtvFragment) oldFragment).releaseResources();
+            ktvFragment = null;
+        }
+
+        if (oldFragment instanceof FriendshipRoomFragment) {
+            ((FriendshipRoomFragment) oldFragment).releaseResources();
+            friendshipRoomFragment = null;
+        }
+
+        if (oldFragment instanceof RoomCabinFragment) {
+            ((RoomCabinFragment) oldFragment).releaseResources();
+            roomCabinFragment = null;
+        }
+
+        if (oldFragment instanceof RoomAuctionFragment) {
+            ((RoomAuctionFragment) oldFragment).releaseResources();
+            roomAuctionFragment = null;
+        }
+
+        if (oldFragment instanceof RoomJukeboxFragment) {
+            roomJukeboxFragment = null;
+        }
+
+        if (oldFragment instanceof RoomMentorShipFragment) {
+            mentorShipFragment = null;
+        }
+
+        if (oldFragment instanceof RoomPubFragment) {
+            roomPubFragment = null;
+        }
+
+        if (oldFragment instanceof RoomPrivateFragment) {
+            roomPrivateFragment = null;
+        }
+        try {
+            FragmentManager fm = getChildFragmentManager();
+            fm.beginTransaction().remove(oldFragment).commitNowAllowingStateLoss();
+        } catch (Exception e) {
+            LogUtils.e("releaseChildFragments error: " + e.getMessage());
+        }
+    }
+
+        @SuppressLint("CheckResult")
     private void performFragmentReplacement(Fragment newFragment) {
         if (getActivity() != null && getActivity() instanceof RoomActivity) {
             if (newFragment instanceof RoomKtvFragment) {
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 693fb7bb..bfbcff53 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
@@ -63,7 +63,7 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) :
 
     private var mCountDownTimer: CountDownTimer? = null
 
-    private val cpUserBean: RoomCpUserBean? = mRoomInfoResp?.cp_user
+    private var cpUserBean: RoomCpUserBean? = mRoomInfoResp?.cp_user
 
 
     override fun initView() {
@@ -95,38 +95,37 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) :
         val selfBean = RoomPitBean() // 自己的 bean
         val otherBean = RoomPitBean() // 另一个用户的 bean
 
-
         // 判断当前用户是 user_id 还是 user_id1
         if (cpUserBean != null) {
-            if (mUserInfo?.user_id.toString() == cpUserBean.user_id) {
+            if (mUserInfo?.user_id.toString() == cpUserBean?.user_id) {
                 // 当前用户是 user_id
-                selfBean.user_id = cpUserBean.user_id
-                selfBean.user_code = cpUserBean.user_code
-                selfBean.nickname = cpUserBean.nickname
-                selfBean.avatar = cpUserBean.avatar
-                selfBean.dress = cpUserBean.dress
+                selfBean.user_id = cpUserBean?.user_id
+                selfBean.user_code = cpUserBean?.user_code
+                selfBean.nickname = cpUserBean?.nickname
+                selfBean.avatar = cpUserBean?.avatar
+                selfBean.dress = cpUserBean?.dress
                 selfBean.pit_number = "000"
 
-                otherBean.user_id = cpUserBean.user_id1
-                otherBean.user_code = cpUserBean.user_code1
-                otherBean.nickname = cpUserBean.nickname1
-                otherBean.avatar = cpUserBean.avatar1
-                otherBean.dress = cpUserBean.dress1
+                otherBean.user_id = cpUserBean?.user_id1
+                otherBean.user_code = cpUserBean?.user_code1
+                otherBean.nickname = cpUserBean?.nickname1
+                otherBean.avatar = cpUserBean?.avatar1
+                otherBean.dress = cpUserBean?.dress1
                 otherBean.pit_number = "000"
-            } else if (mUserInfo?.user_id.toString() == cpUserBean.user_id1) {
+            } else if (mUserInfo?.user_id.toString() == cpUserBean?.user_id1) {
                 // 当前用户是 user_id1，则交换位置
-                selfBean.user_id = cpUserBean.user_id1
-                selfBean.user_code = cpUserBean.user_code1
-                selfBean.nickname = cpUserBean.nickname1
-                selfBean.avatar = cpUserBean.avatar1
-                selfBean.dress = cpUserBean.dress1
+                selfBean.user_id = cpUserBean?.user_id1
+                selfBean.user_code = cpUserBean?.user_code1
+                selfBean.nickname = cpUserBean?.nickname1
+                selfBean.avatar = cpUserBean?.avatar1
+                selfBean.dress = cpUserBean?.dress1
                 selfBean.pit_number = "000"
 
-                otherBean.user_id = cpUserBean.user_id
-                otherBean.user_code = cpUserBean.user_code
-                otherBean.nickname = cpUserBean.nickname
-                otherBean.avatar = cpUserBean.avatar
-                otherBean.dress = cpUserBean.dress
+                otherBean.user_id = cpUserBean?.user_id
+                otherBean.user_code = cpUserBean?.user_code
+                otherBean.nickname = cpUserBean?.nickname
+                otherBean.avatar = cpUserBean?.avatar
+                otherBean.dress = cpUserBean?.dress
                 otherBean.pit_number = "000"
             }
             mBinding?.rpwv1?.pitNumber = "000"
@@ -135,7 +134,7 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) :
             mBinding?.rpwv2?.pitNumber = "000"
             mBinding?.rpwv2?.setData(otherBean)
 
-            countDownTime(cpUserBean.time_day.toLong())
+            countDownTime(cpUserBean?.time_day!!.toLong())
         }
     }
 
@@ -154,7 +153,9 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) :
 
         mUserInfo = this.mRoomInfoResp?.user_info
         mRoomId = this.mRoomInfoResp?.room_info?.room_id!!
+        cpUserBean = this.mRoomInfoResp?.cp_user
         initView()
+        initData()
     }