YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:取消所有的切换后台、im重连给服务段发送接口

Browse Source 
2：修改1058，所有房间添加展示离线
This commit is contained in:
梁小江
2025-12-02 14:11:40 +08:00
parent 56489b3af7
commit 4d2c1a5ace
5 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
View File

@@ -807,7 +807,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
AppLifecycleUtil.onAppFrontGround(); AppLifecycleUtil.onAppFrontGround();
} }
if (playId!=null && !playId.equals("")){ if (playId!=null && !playId.equals("")){
RetrofitClient.getInstance().userRoomBack(playId, "2"); // RetrofitClient.getInstance().userRoomBack(playId, "2");
} }
activityCount++; activityCount++;
} }
@@ -822,7 +822,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
} }
if (playId!=null && !playId.equals("")){ if (playId!=null && !playId.equals("")){
RetrofitClient.getInstance().userRoomBack(playId, "1"); // RetrofitClient.getInstance().userRoomBack(playId, "1");
} }
AppLifecycleUtil.onAppBackGround(); AppLifecycleUtil.onAppBackGround();

2
BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java
View File

@@ -36,7 +36,7 @@ public class IMConnectionService extends Service {
Log.d(TAG, "IM connect success"); Log.d(TAG, "IM connect success");
if (CommonAppContext.getInstance().playId != null) { if (CommonAppContext.getInstance().playId != null) {
LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId); LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId);
RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId); // RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
} }
} }

9
BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java
View File

@@ -46,11 +46,10 @@ public class MqttConnect {
this.clientId = clientId; this.clientId = clientId;
// 这里是你自己需要订阅的主题 // 这里是你自己需要订阅的主题
shutdown = "qx_room_topic"; // 关机 shutdown = "qx_room_topic"; // 房间飘屏
update_app = "qx_xunlehui"; // 发送更新APP update_app = "qx_xunlehui"; // 巡乐会飘屏
// qx_hour_ranking = "qx_hour_ranking"; qx_hour_ranking = "qx_hour_ranking";//小时榜飘屏
qx_hour_ranking = "qx_hour_ranking"; qx_redpacket_arrive = "qx_redpacket_arrive"; //红包飘屏的主题
qx_redpacket_arrive = "qx_redpacket_arrive";
ArrayList<String> topicList = new ArrayList<>(); ArrayList<String> topicList = new ArrayList<>();
topicList.add(shutdown); topicList.add(shutdown);

2
MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
View File

@@ -277,7 +277,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
if (CommonAppContext.getInstance().playId != null) { if (CommonAppContext.getInstance().playId != null) {
LogUtils.e("@@@", "重连成功"); LogUtils.e("@@@", "重连成功");
LogUtils.e("@@@", "" + CommonAppContext.getInstance().playId); LogUtils.e("@@@", "" + CommonAppContext.getInstance().playId);
RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId); // RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
} }
} }

27
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

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