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

酒吧房小黑屋禁止播放cp and jia_jia.

Browse Source
This commit is contained in:
骆召亮
2026-01-14 20:28:54 +08:00
parent 0a0771d5a3
commit b201787513
1 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -598,7 +598,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding?.rlEffects?.setOnClickListener { view: View -> mBinding?.rlEffects?.setOnClickListener { view: View ->
this.onClick( this.onClick(
view view
) )
} }
@@ -1095,7 +1095,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding?.ivPrivateSet?.tag = "1" mBinding?.ivPrivateSet?.tag = "1"
goneAll() goneAll()
SpUtil.getInstance().setIntValue("is_pk",mRoomInfoResp?.room_info?.is_pk?:1) SpUtil.getInstance().setIntValue("is_pk", mRoomInfoResp?.room_info?.is_pk ?: 1)
} }
@@ -1588,19 +1588,22 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} }
} else if (msgType == EMMessageInfo.QXRoomMessageTypeCPText) { } else if (msgType == EMMessageInfo.QXRoomMessageTypeCPText) {
LogUtils.e("CPText", messageEvent.text.rights_icon) LogUtils.e("CPText", messageEvent.text.rights_icon)
if (messageEvent.text.rights_icon.isNotEmpty()) { if (mRoomInfoResp?.room_info?.room_id.equals(messageEvent.roomId)) {
GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer) if (messageEvent.text.rights_icon.isNotEmpty()) {
QXGiftPlayerManager.getInstance(this).displayCPView( GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
messageEvent.text.fromUserInfo.avatar, QXGiftPlayerManager.getInstance(this).displayCPView(
messageEvent.text.toUserInfo.avatar, messageEvent.text.fromUserInfo.avatar,
messageEvent.text.fromUserInfo.nickname, messageEvent.text.toUserInfo.avatar,
messageEvent.text.toUserInfo.nickname, messageEvent.text.fromUserInfo.nickname,
messageEvent.text.rights_icon messageEvent.text.toUserInfo.nickname,
) messageEvent.text.rights_icon
)
}
//TODO================ CP入场不触发播放 临时添加===============
scheduleEnterActivityOnce()
} }
//TODO================ CP入场不触发播放 临时添加===============
scheduleEnterActivityOnce()
} else if (msgType == EMMessageInfo.QXRoomMessageTypeSignStartText) { } else if (msgType == EMMessageInfo.QXRoomMessageTypeSignStartText) {
roomFragment?.handleRoomMessage(messageEvent) roomFragment?.handleRoomMessage(messageEvent)
softRebuildUI() softRebuildUI()
@@ -2117,17 +2120,20 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if (roomId != roomMessageEvent.roomId) { if (roomId != roomMessageEvent.roomId) {
return return
} }
if (roomMessageEvent.text.jia_jia != null && roomMessageEvent.text.jia_jia.isNotEmpty()) {
val gift = GiftBean()
gift.gift_id = ""
gift.play_image = roomMessageEvent.text.jia_jia
setupEffectView()
QXGiftPlayerManager.getInstance(this)
.displayFullEffectView(roomMessageEvent.text.jia_jia)
}
//TODO================ 坐骑入场不触发播放 临时添加=============== if (mRoomInfoResp?.room_info?.room_id.equals(roomMessageEvent.roomId)) {
scheduleEnterActivityOnce() if (roomMessageEvent.text.jia_jia != null && roomMessageEvent.text.jia_jia.isNotEmpty()) {
val gift = GiftBean()
gift.gift_id = ""
gift.play_image = roomMessageEvent.text.jia_jia
setupEffectView()
QXGiftPlayerManager.getInstance(this)
.displayFullEffectView(roomMessageEvent.text.jia_jia)
}
//TODO================ 坐骑入场不触发播放 临时添加===============
scheduleEnterActivityOnce()
}
MvpPre?.getRoomOnline(roomId, "1", "10") MvpPre?.getRoomOnline(roomId, "1", "10")
@@ -2801,7 +2807,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val fragment = RoomPkDialogFragment.newInstance( val fragment = RoomPkDialogFragment.newInstance(
roomId, roomId,
SpUtil.getUserId().toString() + "", SpUtil.getUserId().toString() + "",
SpUtil.getInstance().getIntValue("is_pk",1) SpUtil.getInstance().getIntValue("is_pk", 1)
) )
LogUtils.e("pk_info", "id == R.id.rl_pk ${mRoomInfoResp?.room_info?.is_pk!!}") LogUtils.e("pk_info", "id == R.id.rl_pk ${mRoomInfoResp?.room_info?.is_pk!!}")
@@ -3073,9 +3079,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding?.rlPrivateMsg?.visibility = View.VISIBLE mBinding?.rlPrivateMsg?.visibility = View.VISIBLE
mBinding?.rlEffects?.visibility = View.VISIBLE mBinding?.rlEffects?.visibility = View.VISIBLE
if (SpUtil.getOpenEffect()==1){ if (SpUtil.getOpenEffect() == 1) {
mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_close_effects) mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_close_effects)
}else{ } else {
mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_open_effects) mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_open_effects)
} }