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

Merge branch 'v1.5.0/room' into v1.5.0/test

Browse Source
This commit is contained in:
Max
2023-11-08 18:15:37 +08:00
parent 1f65f99221 73f7998445
commit 046ae8e04e
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/nnbc123/app/avroom/fragment/SingleRoomFragment.kt
View File

@@ -112,13 +112,13 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
} }
} }
fansTeamViewModel.loadFansTeamInitInfo() // fansTeamViewModel.loadFansTeamInitInfo()
fansTeamViewModel.fansTeamInitInfoLiveData.observe(viewLifecycleOwner) { // fansTeamViewModel.fansTeamInitInfoLiveData.observe(viewLifecycleOwner) {
it?.let { // it?.let {
updateFansTeamInfo(it) // updateFansTeamInfo(it)
} // }
} // }
initRoomPkOrder(AvRoomDataManager.get().pkMatchStartTime) initRoomPkOrder(AvRoomDataManager.get().pkMatchStartTime)
gameBinding.llRoomPkOrder.setOnClickListener { gameBinding.llRoomPkOrder.setOnClickListener {
@@ -197,23 +197,23 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
RoomEvent.FANS_TEAM_OPEN_FAILED, RoomEvent.FANS_TEAM_OPEN_FAILED,
RoomEvent.FANS_TEAM_JOIN, RoomEvent.FANS_TEAM_JOIN,
RoomEvent.FANS_TEAM_EXIT -> { RoomEvent.FANS_TEAM_EXIT -> {
(roomEvent.chatRoomMessage?.attachment as? FansTeamMsgAttachment)?.fansTeamMsgInfo?.let { // (roomEvent.chatRoomMessage?.attachment as? FansTeamMsgAttachment)?.fansTeamMsgInfo?.let {
val currFansTeamInitInfo = fansTeamViewModel.fansTeamInitInfoLiveData.value // val currFansTeamInitInfo = fansTeamViewModel.fansTeamInitInfoLiveData.value
updateFansTeamInfo( // updateFansTeamInfo(
FansTeamInitInfo( // FansTeamInitInfo(
it.count, // it.count,
currFansTeamInitInfo?.fansLevelSeq ?: 1, // currFansTeamInitInfo?.fansLevelSeq ?: 1,
roomEvent.event != RoomEvent.FANS_TEAM_OPEN_FAILED, // roomEvent.event != RoomEvent.FANS_TEAM_OPEN_FAILED,
if (AuthModel.get().currentUid == it.uid) { // if (AuthModel.get().currentUid == it.uid) {
roomEvent.event == RoomEvent.FANS_TEAM_JOIN // roomEvent.event == RoomEvent.FANS_TEAM_JOIN
} else { // } else {
currFansTeamInitInfo?.isAnchorFans ?: false // currFansTeamInitInfo?.isAnchorFans ?: false
}, // },
AvRoomDataManager.get().isRoomOwner, // AvRoomDataManager.get().isRoomOwner,
roomEvent.event == RoomEvent.FANS_TEAM_OPEN_FAILED // roomEvent.event == RoomEvent.FANS_TEAM_OPEN_FAILED
) // )
) // )
} // }
} }
RoomEvent.ROOM_PK_INVITE -> RoomEvent.ROOM_PK_INVITE ->
SingleRoomPkReceivedDialog.newInstance((roomEvent.chatRoomMessage.attachment as RoomPKAttachment).roomPkBean) SingleRoomPkReceivedDialog.newInstance((roomEvent.chatRoomMessage.attachment as RoomPKAttachment).roomPkBean)