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

1:修改换麦带着自定义礼物

Browse Source
This commit is contained in:
梁小江
2026-01-08 18:41:07 +08:00
parent ab228eb05d
commit 34552f45ec
6 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1067,6 +1067,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
toActivity(TransparentActivity::class.java)
}
}
mBinding?.ivPrivateSet?.tag = "1"
}
@@ -2563,6 +2564,19 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
pitBean.charm = messageEvent.text.fromUserInfo.charm
pitBean.dress = messageEvent.text.fromUserInfo.dress
pitBean.is_online = messageEvent.text.fromUserInfo.is_online
pitBean.had_custom_gift= messageEvent.text.fromUserInfo.had_custom_gift
if (type == 2) { //这是换麦的时候，这里是做了判断的，需要多次测试，各个房间类型，会不会出现错误，这里的这个值，只是在酒吧房有用
pitBean.had_custom_gift = mRoomInfoResp?.room_info?.pit_list?.let { pitList ->
val pitNumber = messageEvent.text.from_pit_number.toIntOrNull()
if (pitNumber != null && pitNumber > 0 && pitNumber <= pitList.size) {
pitList[pitNumber - 1]?.had_custom_gift ?: 0
} else {
0
}
} ?: 0
}
return pitBean
}
@@ -2769,7 +2783,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
// }
} else if (id == R.id.iv_private_set) {
if (mBinding?.ivPrivateSet?.tag == 1){
if (mBinding?.ivPrivateSet?.tag == "1"){
mBinding?.ivPrivateSet?.setImageResource(R.mipmap.icon_pri_select_off)
mBinding?.ivPrivateSet?.tag = "0"
isShowPrivateMsg = true
@@ -3629,6 +3643,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// .joinRoom(SpUtil.getRtmToken(), roomId, SpUtil.getUserId(), false, false);
// MvpPre?.postRoomInfo(roomId)
MvpPre?.getTasksMessage()
val labelId = mRoomInfoResp?.room_info?.label_id
if (labelId == "11") {
changeBackground(R.mipmap.icon_pri_bg)
}
}
fun refreshRoomInfo(roomId: String) {

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt
View File

@@ -201,7 +201,7 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
)
} else {
if (view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty()) {
if (mRoomInfoResp?.user_info?.pit_number != 0) {
if (mRoomInfoResp?.user_info?.pit_number != 0 && mRoomInfoResp?.user_info?.pit_number != 10) {
MvpPre!!.applyPit(
mRoomInfoResp?.room_info?.room_id!!,
view.pitNumber, ""