1:修改pk上麦的时候，进行换麦后，原还展示星光

2：修改设置房间营业时间，回显的问题

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

@@ -4660,9 +4660,10 @@ public class RetrofitClient {
             public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
                 if (response.code() == 200) {
                     BaseModel<String> baseModel = response.body();
-                    if (baseModel.getCode() == 1)
+                    if (baseModel.getCode() == 1) {
                         ToastUtils.showLong(baseModel.getMsg());
-                    else if (baseModel.getCode() == 301) {
+                        observer.onNext("");
+                    } else if (baseModel.getCode() == 301) {
                         setCode301(baseModel.getMsg());
                     }else if (baseModel.getCode() == 0) {
                         ToastUtils.showLong(baseModel.getMsg());

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

@@ -20,6 +20,11 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
+/**
+ * @Author qx
+ * @Time 2026/1/21 8:59
+ * @Description 时间选择器
+ */
 public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
 
     private OnTimeRangeSelectedListener listener;
@@ -52,6 +57,9 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
     private Calendar endCalendar;
     private View view;
 
+    private String start_time;
+    private String end_time;
+
     public interface OnTimeRangeSelectedListener {
         void onTimeRangeSelected(Date startDate, Date endDate);
     }
@@ -60,8 +68,22 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
         this.listener = listener;
     }
 
+    /**
+     * 开始时间
+     *
+     * @param startTime
+     */
+    public void setTvStartTime(String startTime) {
+        this.start_time = startTime;
+    }
+
+    public void setTvEndTime(String endTime) {
+        this.end_time = endTime;
+    }
+
     /**
      * 设置是否显示时分秒
+     *
      * @param showTime true显示年月日时分秒，false只显示年月日
      */
     public void setShowTime(boolean showTime) {
@@ -70,6 +92,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
 
     /**
      * 设置是否显示日期
+     *
      * @param showDate true显示日期，false只显示时间
      */
     public void setShowDate(boolean showDate) {
@@ -78,6 +101,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
 
     /**
      * 设置是否显示秒
+     *
      * @param showSeconds true显示秒，false不显示秒
      */
     public void setShowSeconds(boolean showSeconds) {
@@ -86,6 +110,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
 
     /**
      * 创建实例
+     *
      * @param showTime true显示年月日时分秒，false只显示年月日
      * @return DoubleTimePickerBottomSheet实例
      */
@@ -97,6 +122,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
 
     /**
      * 创建实例
+     *
      * @param showTime true显示年月日时分秒，false只显示年月日
      * @param showDate true显示日期，false只显示时间
      * @return DoubleTimePickerBottomSheet实例
@@ -108,6 +134,21 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
         return fragment;
     }
 
+    /**
+     * 创建实例
+     *
+     * @param start_time 开始时间
+     * @param end_time   结束时间
+     * @return
+     */
+
+    public static DoubleTimePickerBottomSheet newInstance(String start_time, String end_time) {
+        DoubleTimePickerBottomSheet fragment = new DoubleTimePickerBottomSheet();
+        fragment.setTvStartTime(start_time);
+        fragment.setTvEndTime(end_time);
+        return fragment;
+    }
+
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -207,6 +248,8 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment {
 
         // 初始化显示文本
         updateDisplayText();
+        tvStartTime.setText(start_time);
+        tvEndTime.setText(end_time);
     }
 
     /**

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

@@ -135,16 +135,23 @@ public class RoomDefaultWheatView extends BaseWheatView {
         if (bean.is_pk()) {
             String userId = bean.getUser_id();
             if (userId != null && !userId.equals("0") && !userId.isEmpty()) {
+                if (bean.getCharm().equals("0")){
+                    tv_time_pk.setVisibility(GONE);
+                }else {
                     tv_time_pk.setVisibility(VISIBLE);
+                }
                 setSex(bean.getCharm(), false);
-                mCharmView.setVisibility(GONE);
             } else {
                 tv_time_pk.setVisibility(GONE);
             }
         } else {
             tv_time_pk.setVisibility(GONE);
             if (isOn()) {
+                if (TextUtils.isEmpty(bean.getCharm())){
+                    mCharmView.setVisibility(GONE);
+                }else {
                     mCharmView.setVisibility(VISIBLE);
+                }
             }else {
                 mCharmView.setVisibility(GONE);
             }
@@ -168,7 +175,18 @@ public class RoomDefaultWheatView extends BaseWheatView {
     }
 
     public void setTv_time_pk(boolean show){
-        tv_time_pk.setVisibility(show?VISIBLE:GONE);
+        String userId = pitBean.getUser_id();
+        if (userId != null && !userId.equals("0") && !userId.isEmpty() && show) {
+            if (pitBean.getCharm().equals("0")){
+                tv_time_pk.setVisibility(GONE);
+            }else {
+                tv_time_pk.setVisibility(VISIBLE);
+            }
+            setSex(pitBean.getCharm(), false);
+        } else {
+            tv_time_pk.setVisibility(GONE);
+        }
+//        tv_time_pk.setVisibility(show?VISIBLE:GONE);
     }
 
     private boolean showSexIcon = false;

BaseModule/src/main/res/layout/tab_custom_view.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceSmall"
+    android:padding="8dp" />

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

@@ -3053,6 +3053,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         dialog.show()
     }
 
+    fun setRoomTime(roomInfoResp: RoomInfoResp){
+        this.mRoomInfoResp=roomInfoResp
+    }
+
 
     /**
      * 设置是否打开麦克风

MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java

@@ -18,6 +18,8 @@ public class RoomSettingContacts {
         void agreeSong(String s);
 
         void blindBoxStatus(List<BlindBoxStatus> blindBoxStatus);
+
+        void setRoomBusinessTime();
     }
 
     public interface IRoomPre extends IPresenter {

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

@@ -629,6 +629,10 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
                 if (mIsPriRoom){
                      break;
                 }
+                if (getActivity() instanceof RoomActivity) {
+                    ((RoomActivity) getActivity()).roomInfoEvent(message);
+                }
+                break;
             case 1012:
             case 1011:
             case 1014:
@@ -740,7 +744,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
 
         switch (msgType) {
             case 1001:
-            case 1002:
+
             case 123:
             case 1003:
             case 1004:

MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java

@@ -124,6 +124,10 @@ public class RoomSettingPresenter extends BasePresenter<RoomSettingContacts.View
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef = new WeakReference<>(mView);
+                }
+               MvpRef.get().setRoomBusinessTime();
             }
         });
     }

MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java

@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -514,12 +515,17 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
 
                         Log.d("SelectedTime", "开始时间：" + startTime);
                         Log.d("SelectedTime", "结束时间：" + endTime);
+                        roomInfoResp.getRoom_info().setStart_time(startTime);
+                        roomInfoResp.getRoom_info().setEnd_time(endTime);
                         MvpPre.setRoomBusinessTime(roomId, startTime, endTime);
+
 //                        MvpPre.getCharmList(roomId, stime, etime, currentPage + "", type);
                     });
                     dialog.setShowDate(false);
                     dialog.setShowTime(true);
                     dialog.setShowSeconds(false);
+                    dialog.setTvEndTime(roomInfoResp.getRoom_info().getEnd_time());
+                    dialog.setTvStartTime(roomInfoResp.getRoom_info().getStart_time());
                     dialog.show(getChildFragmentManager(), "DoubleTimePicker");
                 }
 
@@ -900,4 +906,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         }
         adapter.notifyDataSetChanged();
     }
+
+    @Override
+    public void setRoomBusinessTime() {
+        if (ActivityUtils.getTopActivity() instanceof RoomActivity) {
+            ((RoomActivity) ActivityUtils.getTopActivity()).setRoomTime(roomInfoResp);
+        }
+    }
 }