From 23751fd1faab9436eadb0b69ce2f1ace9fddffc0 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Tue, 2 Dec 2025 10:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=201058?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/activity/RoomActivity.kt    | 22 +++++++++----------
 .../activity/room/fragment/RoomFragment.java  |  3 +++
 .../room/fragment/RoomMentorShipFragment.kt   | 10 +++++++++
 3 files changed, 24 insertions(+), 11 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 65f9ab94..44c0100e 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
@@ -1425,28 +1425,28 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             handleMsgType1039(messageEvent, text)
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeRoomIsHostvalue) {
             roomFragment!!.handleMsgType1028(messageEvent)
-        } else if (msgType == EMMessageInfo.QXRoomMessageTypezailx) {
+        } else if (msgType == EMMessageInfo.QXRoomMessageTypezailx) {//1058在离线
             val userId = messageEvent.text?.user_id
             LogUtils.e("messageEvent!!.text.type" + messageEvent.text.type)
             CommonAppContext.getInstance().onlineMap[userId ?: ""] = messageEvent.text.type
             if (mRoomInfoResp != null && mRoomInfoResp?.room_info != null) {
-                if (mRoomInfoResp?.room_info?.type_id == "1" || mRoomInfoResp?.room_info?.type_id == "3" ||
-                    mRoomInfoResp?.room_info?.type_id == "4" || mRoomInfoResp?.room_info?.type_id == "8"
-                ) {
-                    if (mRoomInfoResp?.room_info?.label_id == "1") {
+
+                when(mRoomInfoResp?.room_info?.type_id) {
+                    "1","3","4","8" -> {
+                        if (mRoomInfoResp?.room_info?.label_id == "1") {
 //                        roomFragment!!.SingSongEvent(messageEvent)
-                    } else {
+                        } else {
+                            roomFragment!!.handleRoomMessage(messageEvent)
+                        }
+                    }
+                    "2","7","9","10" -> {
                         roomFragment!!.handleRoomMessage(messageEvent)
                     }
-                } else if (mRoomInfoResp?.room_info?.type_id == "2") {
-                    roomFragment!!.handleRoomMessage(messageEvent)
-                } else if (mRoomInfoResp?.room_info?.type_id == "7") {
-                    roomFragment!!.handleRoomMessage(messageEvent)
                 }
             }
 
             CommonAppContext.getInstance().getOnlineMap()
-        } else if (msgType == EMMessageInfo.QXRoomMessageTypeQingGRMl) { // 1059清除个人魅力  1058在离线
+        } else if (msgType == EMMessageInfo.QXRoomMessageTypeQingGRMl) { // 1059清除个人魅力
             if (mRoomInfoResp != null && mRoomInfoResp?.room_info != null) {
                 roomFragment!!.handleRoomMessage(messageEvent)
             }
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 71f2e9a9..1da1a56e 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
@@ -947,6 +947,9 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
             case 1021:
                 mentorShipFragment.event1021(messageEvent);
                 break;
+            case 1058:
+                mentorShipFragment.event1058(messageEvent);
+                break;
             case EMMessageInfo.QXRoomMessageTypeSignStartText:
                 mentorShipFragment.event1090(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 afea1fe2..f9b1a141 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
@@ -637,4 +637,14 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
             mBinding.rmswMidd.setCharm("0")
         }
     }
+
+    fun event1058(messageEvent: RoomMessageEvent) {
+        val type = messageEvent.text.type
+        for (view in viewList) {
+            if (view.userId.isNotEmpty() && view.userId.equals(messageEvent.text.user_id)) {
+                view.pitBean.is_online = if (type == 1) 1 else 2
+                view.setData(view.pitBean)
+            }
+        }
+    }
 }
\ No newline at end of file