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

84 房间跳转优化。

Browse Source
This commit is contained in:
骆召亮
2025-12-12 10:32:35 +08:00
parent 0d8b0134d9
commit 89374e536d
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MainModule/src/main/java/com/xscm/modulemain/Application.kt
View File

@@ -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,
"知道了",
""
"",
"知道了"
)
})
}