From 34552f45ec949d1bd43bc40e6335546324e7c90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 8 Jan 2026 18:41:07 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=8D=A2=E9=BA=A6=E5=B8=A6?= =?UTF-8?q?=E7=9D=80=E8=87=AA=E5=AE=9A=E4=B9=89=E7=A4=BC=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 2 +- .../com/xscm/moduleutil/bean/UserInfo.java | 2 ++ .../activity/room/activity/RoomActivity.kt | 20 ++++++++++++++++- .../activity/room/fragment/RoomPubFragment.kt | 2 +- .../dialog/barRoom/RoomAboutDialog.kt | 22 ++++++++++++------- .../src/main/res/layout/activity_room.xml | 1 - 6 files changed, 37 insertions(+), 12 deletions(-) diff --git a/.idea/.name b/.idea/.name index 1e71aa94..a8c55747 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -秘地 \ No newline at end of file +羽声语音 \ No newline at end of file diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java index 100d8318..8079a4e5 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java @@ -98,6 +98,8 @@ public class UserInfo extends BaseEvent implements Serializable { private Master master; private int is_online;//是否在线 : 1在线 2离线 + private int had_custom_gift;//是否显示设置了自定义礼物 0：没有 1：有 + @Data public static class Master implements Serializable { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index d3c5e2a0..83d5f4ab 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1067,6 +1067,7 @@ class RoomActivity : BaseMvpActivity(), toActivity(TransparentActivity::class.java) } } + mBinding?.ivPrivateSet?.tag = "1" } @@ -2563,6 +2564,19 @@ class RoomActivity : BaseMvpActivity(), 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(), } // } } 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(), // .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) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt index 7afe48b0..73655d1e 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt @@ -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, "" diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/RoomAboutDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/RoomAboutDialog.kt index e2dd271a..af683b9a 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/RoomAboutDialog.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/RoomAboutDialog.kt @@ -45,6 +45,8 @@ class RoomAboutDialog( // 定义回调接口 private var onConfirmCallback: ((String) -> Unit)? = null + private var isChecked: Boolean = false + // 设置回调接口的方法 fun setOnConfirmListener(callback: (String) -> Unit): RoomAboutDialog { onConfirmCallback = callback @@ -69,15 +71,19 @@ class RoomAboutDialog( } mBinding.tvConfirm.setOnClickListener { - RetrofitClient.getInstance().meetingTa(mRoomId, mUserId,giftId, object : BaseObserver() { - override fun onSubscribe(d: Disposable) { - } + if (isChecked) { + RetrofitClient.getInstance() + .meetingTa(mRoomId, mUserId, giftId, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + } - override fun onNext(t: String) { - dismiss() - } + override fun onNext(t: String) { + dismiss() + isChecked= false + } - }) + }) + } } @@ -118,7 +124,7 @@ class RoomAboutDialog( giftId=t.gift_id } mBinding.tvBalance.text = t.user_wallet_coin ?: "0" - + isChecked= true } }); diff --git a/MainModule/src/main/res/layout/activity_room.xml b/MainModule/src/main/res/layout/activity_room.xml index 84d6b888..445e5caa 100644 --- a/MainModule/src/main/res/layout/activity_room.xml +++ b/MainModule/src/main/res/layout/activity_room.xml @@ -421,7 +421,6 @@ android:id="@+id/iv_private_set" android:layout_width="@dimen/dp_48" android:layout_height="@dimen/dp_24" - android:tag="1" android:layout_centerInParent="true" android:src="@mipmap/icon_pri_select_on" />