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

Merge branch 'branch_new_dev' into branch_new

Browse Source
This commit is contained in:
骆召亮
2025-11-19 10:38:48 +08:00
parent b3f6d3a3fb 1fdcab95f6
commit f7b46d7320
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener,
QXRedPacketManager.QXRedPacketManagerDelegate {
private var roomFragment: RoomFragment? = null
private var mRoomBean: RoomBean? = null
//房主信息
private var mRoomOwnerBean: RoomOwnerBean? = null
@@ -904,7 +903,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
AppStateManager.getInstance().roomInfo = resp
this.mRoomInfoResp = resp
val roomBean = resp.room_info
this.mRoomBean = roomBean
LogUtils.e("setView_mRoomBean", roomBean.toString())
this.mRoomUserBean = resp.user_info
this.mRoomOwnerBean = resp.room_owner
this.roomId = roomBean.room_id
@@ -943,7 +942,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
CommonAppContext.getInstance().isPlaying = true
CommonAppContext.getInstance().playId = roomId
CommonAppContext.getInstance().playName = mRoomBean!!.room_name
CommonAppContext.getInstance().playName = mRoomInfoResp?.room_info?.room_name
CommonAppContext.getInstance().playCover = resp.room_info.room_cover
CommonAppContext.getInstance().showSelf = resp.is_show_self == 1
@@ -1631,8 +1630,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
roomSettingEvent.room_up_pit_type = text.room_up_pit_type
roomSettingEvent.type = messageEvent.msgType
mRoomBean?.room_up_pit_type = text.room_up_pit_type.toString() + ""
EventBus.getDefault().post(mRoomBean)
mRoomInfoResp?.room_info?.room_up_pit_type = text.room_up_pit_type.toString() + ""
EventBus.getDefault().post(mRoomInfoResp?.room_info)
EventBus.getDefault().post(roomSettingEvent)
}
@@ -1892,9 +1891,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private fun handleMsgType1020(messageEvent: RoomMessageEvent, text: T?) {
if (text == null) return
mRoomBean = text.roomInfo
EventBus.getDefault().post(mRoomBean)
changeBackgroundColor(mRoomBean?.room_background)
mRoomInfoResp?.room_info = text.roomInfo
LogUtils.e("1020_mRoomBean", mRoomInfoResp?.room_info.toString())
EventBus.getDefault().post(mRoomInfoResp?.room_info)
changeBackgroundColor(mRoomInfoResp?.room_info?.room_background)
}
private fun handleMsgType1011(messageEvent: RoomMessageEvent, text: T?) {
@@ -2430,7 +2430,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} else if (id == R.id.btn_notice) {
val roomNoticeDialogFragment = RoomNoticeDialogFragment(this)
roomNoticeDialogFragment.setTitle("公告")
roomNoticeDialogFragment.setContent(mRoomBean!!.room_intro)
roomNoticeDialogFragment.setContent(mRoomInfoResp?.room_info?.room_intro)
roomNoticeDialogFragment.show()
addActiveDialog(roomNoticeDialogFragment)
} else if (id == R.id.btn_ranking) { //排行榜