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

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

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);
+        }
+    }
 }