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

1:修改红包跳转和小时榜跳转，头条跳转

Browse Source
This commit is contained in:
梁小江
2025-12-05 21:22:31 +08:00
parent 60b910c38f
commit 6721e8e376
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1083,7 +1083,6 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
// 使用缓存数据进入房间
if (ActivityUtils.getTopActivity() instanceof RoomActivity){
if (!Objects.equals(((RoomActivity) ActivityUtils.getTopActivity()).getRoomId(), xlhBean.getRoom_id())) {
MessageListenerSingleton.getInstance().joinGroup(xlhBean.getRoom_id());
((RoomActivity) ActivityUtils.getTopActivity()).refreshRoomInfo(xlhBean.getRoom_id());
}
return;
@@ -1098,7 +1097,6 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
// 使用缓存数据进入房间
if (ActivityUtils.getTopActivity() instanceof RoomActivity){
if (!Objects.equals(((RoomActivity) ActivityUtils.getTopActivity()).getRoomId(), redBean.getRoom_id())) {
MessageListenerSingleton.getInstance().joinGroup(redBean.getRoom_id());
((RoomActivity) ActivityUtils.getTopActivity()).refreshRoomInfo(redBean.getRoom_id());
}
return;

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

@@ -2095,13 +2095,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
parent.removeView(currentMqttView)
}
// 将视图放回池中
currentMqttView?.visibility = View.GONE
// try {
floatingViewPool.add(currentMqttView!!)
currentMqttView?.let { view ->
view.visibility = View.GONE
floatingViewPool.add(view)
}
currentMqttView = null
// }catch (e:Exception){
// LogUtils.e("飘屏显示异常", e)
// }
})
}
}
@@ -3378,8 +3376,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// "",
// null
// )
MessageListenerSingleton.getInstance()
.joinGroup(mRoomInfoResp?.room_info?.head_line?.room_id)
// MessageListenerSingleton.getInstance()
// .joinGroup(mRoomInfoResp?.room_info?.head_line?.room_id)
roomId2=mRoomInfoResp?.room_info?.head_line?.room_id
getHour()
MvpPre?.getRoomIn(mRoomInfoResp?.room_info?.head_line?.room_id, "")
} else {
com.blankj.utilcode.util.ToastUtils.showLong("您就在当前房间")
@@ -3779,6 +3779,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
fun refreshRoomInfo(roomId: String) {
roomId2=roomId
getHour()
MvpPre?.getRoomIn(roomId, "")
}