1:添加交友小屋接口

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

BaseModule/src/main/java/com/xscm/moduleutil/bean/BlackRoomBean.kt

@@ -0,0 +1,28 @@
+package com.xscm.moduleutil.bean
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2026/1/7 19:47
+ * 用途：
+ */
+class BlackRoomBean {
+
+    var id: Int = 0
+    var p_room_id: Int = 0
+    var room_id: Int = 0
+    var user_id: Int = 0
+    var meet_user_id: Int = 0
+    var end_time: Int = 0
+    var createtime: Int = 0
+    var status: Int = 0
+    var heart_value: String? = ""
+   /* "id": 1,
+    "p_room_id": 6065,
+    "room_id": 6071,
+    "user_id": 20142,
+    "meet_user_id": 20137,
+    "end_time": 1767957473,
+    "createtime": 1767784373,
+    "status": 1,
+    "heart_value": null*/
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java

@@ -52,8 +52,8 @@ public class RoomMessageEvent extends BaseEvent {
         private String SendRoomId;//发起者所在的房间ID
         private String AcceptRoomId;//接收者所在的房间id
         private String PkId;
-        private String room_id;//当type==1的时候。这个roomId是对方的房间id
-        private String user_id = "";
+        private String room_id;//当type==1的时候。这个roomId是对方的房间id   当是酒吧房的时候，就是需要进入的小房间的id
+        private String user_id = "";  //当是酒吧房的时候，这个值就是要进入小黑屋的房主信息
         private String pk_end_times;//pk结束时间
         private List<RoomPitBean> userCharmList;
 
@@ -116,6 +116,8 @@ public class RoomMessageEvent extends BaseEvent {
 
         private String play_image;//暴币播放动画地址
 
+        private String meet_user_id="";//当是酒吧房的时候，就是被约的用户id
+
     }
 
     @Data

BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java

@@ -163,6 +163,8 @@ public class EMMessageInfo implements MultiItemEntity {
 
     /// 酒吧房撩ta推送
     public static final int QXRoomMessageTypeFlirtatious = 1200;
+    /// 进入酒吧房的小黑屋
+    public static final int QXRoomMessageTypeFlirtatiousRoom = 1201;
 
 
     private RoomMessageEvent emMessage;

BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java

@@ -489,6 +489,10 @@ public interface ApiServer {
     @POST(Constants.POST_PAY_DECORATE)
     Call<BaseModel<String>> payDecorate(@Field("did") String id, @Field("day") String day,@Field("num") String num);
 
+    @FormUrlEncoded
+    @POST(Constants.POST_BLACK_ROOM_LIST)
+    Call<BaseModel<List<BlackRoomBean>>>getBlackRoomList(@Field("room_id") String roomId);
+
     @FormUrlEncoded
     @POST(Constants.POST_GZ)
     Call<BaseModel<String>> userGuanz(@Field("user_id") String userId, @Field("type") String type);
@@ -930,6 +934,10 @@ public interface ApiServer {
     @GET(Constants.GET_GIFT_INFO_TA)
     Call<BaseModel<RoonGiftModel>> getGiftInfoTa(@Query("room_id") String roomId, @Query("to_user_id") String user_id);
 
+    @FormUrlEncoded
+    @POST(Constants.POST_MEETING_TA)
+    Call<BaseModel<String>> meetingTa(@Field("room_id") String room_id, @Field("user_id") String user_id, @Field("gift_id") String gift_id);
+
     @FormUrlEncoded
     @POST(Constants.ROOM_USER_RECONNECT)
     Call<BaseModel<String>> roomUserReconnect(@Field("room_id") String room_id);

BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java

@@ -1281,7 +1281,7 @@ public class RetrofitClient {
                         ToastUtils.showLong(baseModel.getMsg());
                     }
                 }else {
-                    ToastUtils.showLong("约她出现错误", response.code());
+                    ToastUtils.showLong("约她获取礼物出现错误", response.code());
                     LogUtils.e("getGiftInfoTa", response.message());
                 }
             }
@@ -1292,7 +1292,25 @@ public class RetrofitClient {
             }
         });
     }
+    public void meetingTa(String roomId, String userId, String giftId, BaseObserver<String> observer) {
+        sApiServer.meetingTa(roomId, userId, giftId).enqueue(new Callback<BaseModel<String>>() {
 
+            @Override
+            public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
+                if (response.code() == 200) {
+                    onNextRetu(response, observer);
+                }else {
+                    ToastUtils.showLong("约她进房间出现错误", response.code());
+                    LogUtils.e("meetingTa", response.message());
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<String>> call, Throwable t) {
+                LogUtils.e("meetingTa", t.fillInStackTrace());
+            }
+        });
+    }
 
     public void roomUserReconnect(String roomId) {
         sApiServer.roomUserReconnect(roomId).enqueue(new Callback<BaseModel<String>>() {
@@ -2857,6 +2875,39 @@ public class RetrofitClient {
 
     }
 
+    public void getBlackRoomList(String roomId,BaseObserver<List<BlackRoomBean>> observer){
+        sApiServer.getBlackRoomList(roomId).enqueue(new Callback<BaseModel<List<BlackRoomBean>>>() {
+
+            @Override
+            public void onResponse(Call<BaseModel<List<BlackRoomBean>>> call, Response<BaseModel<List<BlackRoomBean>>> response) {
+                if (response.code() == 200) {
+                    BaseModel<List<BlackRoomBean>> listBaseModel = response.body();
+                    if (listBaseModel.getCode() == 1) {
+                        if (listBaseModel.getData()==null){
+                            observer.onNext(new ArrayList<>());
+                        }else {
+                            observer.onNext(listBaseModel.getData());
+                        }
+                    } else if (listBaseModel.getCode() == 301) {
+                        setCode301(listBaseModel.getMsg());
+                    }else if (listBaseModel.getCode() == 0) {
+                        ToastUtils.showShort(listBaseModel.getMsg());
+                        observer.onNext(new ArrayList<>());
+                    }
+                }else {
+                    ToastUtils.showLong("请求交友小屋列表错误", response.code());
+                    LogUtils.e("getBlackRoomList", response.message());
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<List<BlackRoomBean>>> call, Throwable t) {
+                LogUtils.e("getBlackRoomList", t.getMessage());
+            }
+        });
+
+    }
+
     public void getDecorateDetail(String did, BaseObserver<DecorateDetailBean> observer) {
         sApiServer.getDecorateDetail(did).enqueue(new Callback<BaseModel<DecorateDetailBean>>() {
 

BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java

@@ -269,6 +269,7 @@ public class Constants {
     public static final String BEFORE_JOIN_ROOM_CHECK = "/api/Room/before_join_room_check";//加入房间前检查
     public static final String TASK_JUMP_ROOM = "/api/Room/task_jump_room";//师徒任务 加入房间
     public static final String GET_PIT_TIME = "/api/BarRoom/get_pit_time_list";//酒吧房麦位时长列表
+    public static final String POST_BLACK_ROOM_LIST = "/api/BarRoom/black_room_list";//小黑屋（酒吧房，交友小屋）列表
 
     public static final String UPDATEPASSWORD = "/api/room/setRoomPassword";//更新房间秘密啊
     public static final String GET_ROOM_ONLINE = "/api/Room/room_online_list";//房间在线列表
@@ -298,7 +299,8 @@ public class Constants {
     public static final String GET_ROOM_USER = "/api/Room/room_user_home";//房间内点击头像
     public static final String APPLY_PIT = "/api/RoomPit/apply_pit";//申请上麦
     public static final String POST_LIAO_TA = "/api/BarRoom/liao_ta";//撩他
-    public static final String GET_GIFT_INFO_TA = "/api/BarRoom/get_gift_info_ta";//约她
+    public static final String GET_GIFT_INFO_TA = "/api/BarRoom/get_gift_info_ta";//约她获取礼物详情
+    public static final String POST_MEETING_TA = "/api/BarRoom/meeting_ta";//约她进房间
     public static final String DOWN_PIT = "/api/RoomPit/down_pit";//下麦
     public static final String ADDRESS_IP = "/api/User/update_user_ip";//修改ip地址
     public static final String REWARD_ZONE = "/api/UserZone/reward_zone";//动态打赏礼物