1:添加交友小屋接口

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

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

@@ -1578,6 +1578,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 .displayChatEffectView(messageEvent.text.play_image)
         }else if( msgType == EMMessageInfo.QXRoomMessageTypeFlirtatious){ //酒吧房撩ta推送的信息
             roomFragment?.handleRoomMessage(messageEvent)
+        }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoom) {//酒吧房约她进入小黑屋
+
         }
     }
 

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java

@@ -555,6 +555,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
             case 1071:
             case 125:
             case 1080:
+            case 1201:
                 if (getActivity() instanceof RoomActivity) {
                     ((RoomActivity) getActivity()).roomInfoEvent(message);
                 }

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

@@ -5,6 +5,7 @@ import android.text.TextUtils
 import android.view.View
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.LogUtils
+import com.blankj.utilcode.util.ToastUtils
 import com.xscm.modulemain.R
 import com.xscm.modulemain.activity.room.activity.RoomActivity
 import com.xscm.modulemain.activity.room.presenter.PubPresenter
@@ -204,15 +205,27 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
                             if (mRoomInfoResp?.user_info?.pit_number != 0) {
                                 MvpPre!!.applyPit(
                                     mRoomInfoResp?.room_info?.room_id!!,
-                                    view.pitNumber,""
+                                    view.pitNumber, ""
                                 )
                             } else {
-                                // TODO: 这是展示设置心愿礼物的，这里有个点，要考虑，当前用户在麦位上，点击的时候，直接走上麦按钮，如果不在麦上，就直接选择心愿礼物
-                                WishGiftDialog(
-                                    ActivityUtils.getTopActivity(),
-                                    mRoomId,
-                                    view.pitNumber
-                                ).show()
+                                // TODO: 2026年1月7日20:22:58，添加了上主持麦进行判断，主持麦不需要选择礼物
+                                if (view.pitNumber == "9") {
+                                    MvpPre!!.applyPit(
+                                        mRoomInfoResp?.room_info?.room_id!!,
+                                        view.pitNumber,
+                                        ""
+                                    )
+                                } else if (view.pitNumber == "10") {
+                                    ToastUtils.showLong("需要主持才可以抱上去哟！")
+                                } else {
+
+                                    // TODO: 这是展示设置心愿礼物的，这里有个点，要考虑，当前用户在麦位上，点击的时候，直接走上麦按钮，如果不在麦上，就直接选择心愿礼物
+                                    WishGiftDialog(
+                                        ActivityUtils.getTopActivity(),
+                                        mRoomId,
+                                        view.pitNumber
+                                    ).show()
+                                }
                             }
 //                            MvpPre!!.applyPit(mRoomInfoResp?.room_info?.room_id!!, view.pitNumber)
                         } else {
@@ -318,12 +331,14 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
             val pitBean = mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1]
             pitBean.end_time = messageEvent.text.end_time
             viewList[viewPos].setData(pitBean)
-
-            if (mUserInfo?.user_id.toString() == pitBean.user_id) {
-                mBinding.ivSetTime.visibility = View.VISIBLE
+            if (pitNumber == "9") { // 添加判断麦位，是否是9号麦
+                if (mUserInfo?.user_id.toString() == pitBean.user_id) {
+                    mBinding.ivSetTime.visibility = View.VISIBLE
+                }
             }
         }
 
+
         startTimer(messageEvent.text.end_time.toLong())
     }
 
@@ -333,6 +348,10 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
             val viewPos = indexList.indexOf(pitNumber)
             val pitBean = mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1]
             viewList[viewPos].setData(pitBean)
+
+            if (pitNumber == "9") { // 添加判断麦位，是否是9号麦
+                mBinding.ivSetTime.visibility = View.GONE
+            }
         }
         var isMaiPit = false
         viewList.forEach { it ->