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

.idea/.name

@@ -1 +1 @@
-秘地
+羽声语音

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 {

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

@@ -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) {

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, ""

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<String>() {
+            if (isChecked) {
-                override fun onSubscribe(d: Disposable) {
+                RetrofitClient.getInstance()
-                }
+                    .meetingTa(mRoomId, mUserId, giftId, object : BaseObserver<String>() {
+                        override fun onSubscribe(d: Disposable) {
+                        }
 
-                override fun onNext(t: String) {
+                        override fun onNext(t: String) {
-                    dismiss()
+                            dismiss()
-                }
+                            isChecked= false
+                        }
 
-            })
+                    })
+            }
 
         }
 
@@ -118,7 +124,7 @@ class RoomAboutDialog(
                     giftId=t.gift_id
                 }
                 mBinding.tvBalance.text = t.user_wallet_coin ?: "0"
-
+                isChecked= true
             }
 
         });

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" />
             </RelativeLayout>