From 4d2c1a5ace1f021f6241f5ae6586356961da5edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Tue, 2 Dec 2025 14:11:40 +0800 Subject: [PATCH] =?UTF-8?q?1:=E5=8F=96=E6=B6=88=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=90=8E=E5=8F=B0=E3=80=81im=E9=87=8D?= =?UTF-8?q?=E8=BF=9E=E7=BB=99=E6=9C=8D=E5=8A=A1=E6=AE=B5=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=202=EF=BC=9A=E4=BF=AE=E6=94=B91058=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=88=BF=E9=97=B4=E6=B7=BB=E5=8A=A0=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=A6=BB=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moduleutil/base/CommonAppContext.java | 4 +-- .../service/IMConnectionService.java | 2 +- .../xscm/moduleutil/service/MqttConnect.java | 9 +++--- .../com/xscm/modulemain/BaseMvpActivity.java | 2 +- .../activity/room/activity/RoomActivity.kt | 29 +++++++++---------- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 990dd082..a0f0a00c 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -807,7 +807,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio AppLifecycleUtil.onAppFrontGround(); } if (playId!=null && !playId.equals("")){ - RetrofitClient.getInstance().userRoomBack(playId, "2"); +// RetrofitClient.getInstance().userRoomBack(playId, "2"); } activityCount++; } @@ -822,7 +822,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio } if (playId!=null && !playId.equals("")){ - RetrofitClient.getInstance().userRoomBack(playId, "1"); +// RetrofitClient.getInstance().userRoomBack(playId, "1"); } AppLifecycleUtil.onAppBackGround(); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java b/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java index c24d6b35..276928b7 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java @@ -36,7 +36,7 @@ public class IMConnectionService extends Service { Log.d(TAG, "IM connect success"); if (CommonAppContext.getInstance().playId != null) { LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId); - RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId); +// RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId); } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java b/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java index 6aa9e201..70499211 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java @@ -46,11 +46,10 @@ public class MqttConnect { this.clientId = clientId; // 这里是你自己需要订阅的主题 - shutdown = "qx_room_topic"; // 关机 - update_app = "qx_xunlehui"; // 发送更新APP -// qx_hour_ranking = "qx_hour_ranking"; - qx_hour_ranking = "qx_hour_ranking"; - qx_redpacket_arrive = "qx_redpacket_arrive"; + shutdown = "qx_room_topic"; // 房间飘屏 + update_app = "qx_xunlehui"; // 巡乐会飘屏 + qx_hour_ranking = "qx_hour_ranking";//小时榜飘屏 + qx_redpacket_arrive = "qx_redpacket_arrive"; //红包飘屏的主题 ArrayList topicList = new ArrayList<>(); topicList.add(shutdown); diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java index 8f230d47..53e395dc 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java @@ -277,7 +277,7 @@ public abstract class BaseMvpActivity

(), // 输出当前的播放ID信息 LogUtils.e("@@@", "" + CommonAppContext.getInstance().playId) // 调用RetrofitClient执行房间用户重连操作 - RetrofitClient.getInstance() - .roomUserReconnect(CommonAppContext.getInstance().playId) +// RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId) } } @@ -1434,19 +1433,19 @@ class RoomActivity : BaseMvpActivity(), LogUtils.e("messageEvent!!.text.type" + messageEvent.text.type) CommonAppContext.getInstance().onlineMap[userId ?: ""] = messageEvent.text.type if (mRoomInfoResp != null && mRoomInfoResp?.room_info != null) { - - when(mRoomInfoResp?.room_info?.type_id) { - "1","3","4","8" -> { - if (mRoomInfoResp?.room_info?.label_id == "1") { -// roomFragment!!.SingSongEvent(messageEvent) - } else { - roomFragment!!.handleRoomMessage(messageEvent) - } - } - "2","7","9","10" -> { - roomFragment!!.handleRoomMessage(messageEvent) - } - } + roomFragment!!.handleRoomMessage(messageEvent) +// when(mRoomInfoResp?.room_info?.type_id) { +// "1","3","4","8" -> { +// if (mRoomInfoResp?.room_info?.label_id == "1") { +//// roomFragment!!.SingSongEvent(messageEvent) +// } else { +// roomFragment!!.handleRoomMessage(messageEvent) +// } +// } +// "2","7","9","10" -> { +// roomFragment!!.handleRoomMessage(messageEvent) +// } +// } } CommonAppContext.getInstance().getOnlineMap()