From 89374e536d80998a45380ea196918305b6781497 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 12 Dec 2025 10:32:35 +0800
Subject: [PATCH] =?UTF-8?q?84=20=E6=88=BF=E9=97=B4=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xscm/modulemain/Application.kt   | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/Application.kt b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
index 5136f7b2..1d81e28e 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/Application.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/Application.kt
@@ -12,7 +12,7 @@ import com.opensource.svgaplayer.utils.log.SVGALogger
 import com.scwang.smartrefresh.layout.SmartRefreshLayout
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
-import com.xscm.modulemain.activity.main.activity.MainActivity
+import com.xscm.modulemain.activity.room.activity.RoomActivity
 import com.xscm.modulemain.dialog.InviteDialog
 import com.xscm.modulemain.manager.RoomManager
 import com.xscm.modulemain.utils.TimerManager
@@ -87,9 +87,11 @@ open class Application : CommonAppContext() {
                     TimerManager.cancelTimer(CustomMsgCode.CODE_TASK_APPRENTICE_JOIN_ROOM_TIMER_ID)
                     val json = JSONObject(event.text.text)
                     event.text.status = json.getString("status")
-                    event.text.room_id = json.getString("room_id")
                     when (event.text.status) {
                         "1" -> {//1:邀请
+                            event.text.room_id = json.getString("room_id")
+                            if (event?.text?.room_id.isNullOrEmpty())
+                                return@setOnMsgTaskListener
                             customDialog(
                                 event.text.room_id,
                                 CustomMsgCode.CODE_TASK_APPRENTICE_JOIN_ROOM_MSG,
@@ -106,8 +108,8 @@ open class Application : CommonAppContext() {
                                 5,
                                 3,
                                 null,
-                                "知道了",
-                                ""
+                                "",
+                                "知道了"
                             )
                         }
                     }
@@ -135,8 +137,14 @@ open class Application : CommonAppContext() {
             { v: View? ->
                 when (status) {
                     1 -> {
-                        if (roomId.equals(CommonAppContext.getInstance().playId))
+                        if (roomId == CommonAppContext.getInstance().playId)
                             return@ConfirmDialog
+
+                        if (ActivityUtils.getTopActivity() is RoomActivity){
+                            (ActivityUtils.getTopActivity() as RoomActivity).refreshRoomInfo(roomId)
+                            return@ConfirmDialog
+                        }
+
                         RoomManager.getInstance()
                             .fetchRoomDataAndEnter(ActivityUtils.getTopActivity(), roomId, "", "")
                     }
@@ -148,6 +156,7 @@ open class Application : CommonAppContext() {
                         val text = RoomMessageEvent.T()
                         val json = JSONObject()
                         json.put("status", "2")
+                        json.put("room_id", roomId)
                         text.text = json.toString()
                         MessageListenerSingleton.getInstance().sendCustomC2CMessage(
                             CustomMsgCode.CODE_TASK_APPRENTICE_JOIN_ROOM,
@@ -172,8 +181,8 @@ open class Application : CommonAppContext() {
                     5,
                     3,
                     null,
-                    "知道了",
-                    ""
+                    "",
+                    "知道了"
                 )
             })
     }