1:添加交友小屋接口

2：修改上下麦展示设置时长的问题
3：修改上主持麦出现选择礼物的弹框
4：添加上嘉宾麦的判断

MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/MakeFriendsDialog.kt

@@ -4,16 +4,14 @@ import android.content.Context
 import android.view.Gravity
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
-import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ScreenUtils
 import com.xscm.modulemain.R
 import com.xscm.modulemain.adapter.FixedItemAdapter
-import com.xscm.modulemain.adapter.RoomGiftGivingAdapter
-import com.xscm.modulemain.databinding.DialogGiftGivingBinding
 import com.xscm.modulemain.databinding.DialogMakeFriendsBinding
-import com.xscm.moduleutil.bean.RoonGiftModel
+import com.xscm.moduleutil.bean.BlackRoomBean
 import com.xscm.moduleutil.http.BaseObserver
 import com.xscm.moduleutil.http.RetrofitClient
+import com.xscm.moduleutil.widget.CommonEmptyView
 import com.xscm.moduleutil.widget.dialog.BaseDialog
 import io.reactivex.disposables.Disposable
 
@@ -22,10 +20,11 @@ import io.reactivex.disposables.Disposable
  * 时间：2026/1/5 19:27
  * 用途：交友小屋弹窗
  */
-class MakeFriendsDialog(context: Context, val roomId: String?) :
+class MakeFriendsDialog(context: Context, var roomId: String?) :
     BaseDialog<DialogMakeFriendsBinding>(context, com.xscm.moduleutil.R.style.BaseDialogStyleH) {
 
     var adapter: FixedItemAdapter? = null
+    var mRoomId: String? = roomId
 
     override fun getLayoutId(): Int {
         return R.layout.dialog_make_friends
@@ -41,31 +40,41 @@ class MakeFriendsDialog(context: Context, val roomId: String?) :
 
 
     override fun initData() {
-        // TODO: 这里调用的事设置插队礼物接口
-//        RetrofitClient.getInstance().getGiftList(1,roomId,object : BaseObserver<MutableList<RoonGiftModel>>() {
-//            override fun onSubscribe(d: Disposable) {
-//            }
-//
-//            override fun onNext(t: MutableList<RoonGiftModel>) {
-//                if (t.isNotEmpty()) {
-//                    adapter = RoomGiftGivingAdapter(t) { selectedValue, position ->
-//                        // 处理选中事件
-//                        LogUtils.e("选中了: $selectedValue, 位置: $position")
-//                    }
-//
-//                    // 设置GridLayoutManager，每行显示4个item
-//                    val layoutManager =
-//                        GridLayoutManager(context, 4)
-//                    mBinding.recycleView.layoutManager = layoutManager
-//                    mBinding.recycleView.adapter = adapter
-//                }
-//            }
-//        })
-        val layoutManager =
-            GridLayoutManager(context, 2)
-        adapter= FixedItemAdapter(15)
-        mBinding.recycleView.layoutManager = layoutManager
-        mBinding.recycleView.adapter = adapter
+//        val layoutManager =
+//            GridLayoutManager(context, 2)
+//        adapter = FixedItemAdapter(15)
+//        mBinding.recycleView.layoutManager = layoutManager
+//        mBinding.recycleView.adapter = adapter
+
+    }
+
+    override fun show(){
+        super.show()
+         RetrofitClient.getInstance().getBlackRoomList(roomId,object : BaseObserver<MutableList<BlackRoomBean>>() {
+             override fun onSubscribe(d: Disposable) {
+             }
+
+             override fun onNext(t: MutableList<BlackRoomBean>) {
+                 val layoutManager =
+                     GridLayoutManager(context, 2)
+                 if(t.isNotEmpty()){
+                     adapter = FixedItemAdapter(t.size)
+                 }else{
+                     adapter = FixedItemAdapter(0)
+                 }
+
+                 mBinding.recycleView.layoutManager = layoutManager
+                 mBinding.recycleView.adapter = adapter
+
+                 val commonEmptyView = CommonEmptyView(context)
+                 commonEmptyView.setImg(R.mipmap.ic_empty)
+                 commonEmptyView.setTextColor(context.getResources().getColor(com.xscm.moduleutil.R.color.color_FFBDBDBC))
+                 commonEmptyView.setEmptyText("暂无数据交友小屋数据")
+                 adapter?.bindToRecyclerView(mBinding.recycleView)
+                 adapter?.setEmptyView(commonEmptyView)
+             }
+
+         })
 
     }
 

MainModule/src/main/java/com/xscm/modulemain/dialog/barRoom/RoomAboutDialog.kt

@@ -40,6 +40,8 @@ class RoomAboutDialog(
     private var mUserId: String = userId
     private var mUsername: String = username
     private var mAvatar: String = avatar
+
+    private var giftId: String =""
     // 定义回调接口
     private var onConfirmCallback: ((String) -> Unit)? = null
 
@@ -67,8 +69,16 @@ class RoomAboutDialog(
         }
 
         mBinding.tvConfirm.setOnClickListener {
-            onConfirmCallback?.invoke("")
-            dismiss()
+            RetrofitClient.getInstance().meetingTa(mRoomId, mUserId,giftId, object : BaseObserver<String>() {
+                override fun onSubscribe(d: Disposable) {
+                }
+
+                override fun onNext(t: String) {
+                    dismiss()
+                }
+
+            })
+
         }
 
         mBinding.tvRecharge.setOnClickListener {
@@ -105,6 +115,7 @@ class RoomAboutDialog(
                     mBinding.tvGiftPrice.text = t.gift_price
                     ImageUtils.loadHead(t.base_image, mBinding.ivGiftPic)
                     mBinding.tvGiftName.text = t.gift_name
+                    giftId=t.gift_id
                 }
                 mBinding.tvBalance.text = t.user_wallet_coin ?: "0"