From 8e9f6fa23cf7d75d29d21891d606a2e6b7ca1eb6 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 3 Dec 2025 17:33:30 +0800
Subject: [PATCH] fix bugs.2

---
 .../listener/MessageListenerSingleton.java    |  7 +++-
 .../xscm/moduleutil/widget/BaseWheatView.java | 22 +---------
 .../activity/room/fragment/RoomFragment.java  |  3 ++
 .../room/fragment/RoomMentorShipFragment.kt   | 41 +++++++++++++++----
 .../dialog/RoomUserInfoFragment.java          |  2 +-
 5 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java b/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java
index d74e0fb9..b70b9963 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java
@@ -35,6 +35,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
@@ -92,6 +93,7 @@ public class MessageListenerSingleton {
 
     // 同时修改 removePublicScreenMessageListener 方法
     public void removePublicScreenMessageListener(PublicScreenMessageListener listener) {
+        mRoomId = "";
         if (listener == null) {
             return;
         }
@@ -203,7 +205,8 @@ public class MessageListenerSingleton {
         if (TextUtils.isEmpty(roomId)) {
             return;
         }
-        mRoomId = roomId;
+        if (Objects.equals(mRoomId, roomId))
+            return;
         synchronized (groupOperationLock) {
             if (isGroupOperationInProgress) {
                 // 如果有操作正在进行，延迟执行
@@ -214,7 +217,7 @@ public class MessageListenerSingleton {
 
             isGroupOperationInProgress = true;
         }
-
+        mRoomId = roomId;
         new Thread(() -> {
             try {
                 // 先退出当前群组（如果需要）
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
index a7c1c465..73bdb796 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
@@ -179,16 +179,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
         setCardiac(pitBean.getCharm(), getTzbl());
 
         if (bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {
-//            if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) != null) {
-//                iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) == 1 ? GONE : VISIBLE);
-//            } else {
-//                iv_on_line.setVisibility(GONE);
-//            }
-            if (bean.getIs_online()== 1) {
-                iv_on_line.setVisibility(GONE);
-            }else {
-                iv_on_line.setVisibility(VISIBLE);
-            }
+            iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE);
         } else {
             iv_on_line.setVisibility(GONE);
         }
@@ -429,16 +420,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
 
     public void setOnlineStatus() {
         if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
-//            if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) != null) {
-//                iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) == 1 ? GONE : VISIBLE);
-//            } else {
-//                iv_on_line.setVisibility(GONE);
-//            }
-            if(pitBean.getIs_online()==1){
-                iv_on_line.setVisibility(GONE);
-            }else {
-                iv_on_line.setVisibility(VISIBLE);
-            }
+            iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE);
         } else {
             iv_on_line.setVisibility(GONE);
         }
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 e4e4a1da..2c3cb88e 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
@@ -938,6 +938,9 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
             case 1035:
                 mentorShipFragment.event1035(messageEvent);
                 break;
+            case 1039:
+                mentorShipFragment.event1039(messageEvent);
+                break;
             case 1059:
                 mentorShipFragment.event1059(messageEvent);
                 break;
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
index 58e38122..61d5a685 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
@@ -368,14 +368,14 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
             viewList[indexList.indexOf("2")].setData(pitBean)
 
             //当前麦上出价，需要更麦上数据
-            for (i in 0 until viewList.size) {
-                if(i == 1 || i == 2){
-                    continue
-                }
-                if (viewList[i].pitBean?.user_id != "0" && viewList[i].pitBean?.user_id == pitBean.user_id) {
-                    viewList[i].setData(mRoomInfo?.room_info?.pit_list!![indexList[i].toInt() - 1])
-                }
-            }
+//            for (i in 0 until viewList.size) {
+//                if(i == 1 || i == 2){
+//                    continue
+//                }
+//                if (viewList[i].pitBean?.user_id != "0" && viewList[i].pitBean?.user_id == pitBean.user_id) {
+//                    viewList[i].setData(mRoomInfo?.room_info?.pit_list!![indexList[i].toInt() - 1])
+//                }
+//            }
 
 
             if (dialogMentorShip != null && dialogMentorShip?.isShowing!!) {
@@ -482,6 +482,29 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
 
     }
 
+    fun event1039(messageEvent: RoomMessageEvent) {
+        val fromId = messageEvent.text.from_pit_number
+        val toId = messageEvent.text.to_pit_number
+        if (indexList.contains(fromId)) {
+            val viewPos = indexList.indexOf(fromId)
+            val pitBean = mRoomInfo?.room_info?.pit_list!![fromId.toInt() - 1]
+            viewList[viewPos].setData(pitBean)
+            if (fromId == "1") {
+                mSignPitBean = pitBean
+            }
+        }
+
+        if (indexList.contains(toId)) {
+            val viewPos = indexList.indexOf(toId)
+            val pitBean = mRoomInfo?.room_info?.pit_list!![toId.toInt() - 1]
+            viewList[viewPos].setData(pitBean)
+            if (toId == "1") {
+                mSignPitBean = pitBean
+            }
+        }
+        showBtn()
+    }
+
     // TODO: 清除个人魅力
     fun event1059(messageEvent: RoomMessageEvent) {
         val userId: String? = messageEvent.text.user_id
@@ -656,4 +679,6 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
             }
         }
     }
+
+
 }
\ No newline at end of file
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
index e46ad337..79799212 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -427,7 +427,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
                 if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit");
                 break;
             case 2:
-//                if ("is_host".equals(key)) return textMap.get("is_host");
+                if ("is_host".equals(key)) return textMap.get("is_host");
                 if ("is_mute".equals(key)) return textMap.get("is_mute");
                 if ("is_mute_pit".equals(key)) return textMap.get("is_mute_pit");
                 break;