From d6efdefc99d22cb9d0839e58b428a5eaa0342f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Thu, 25 Dec 2025 18:40:41 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=9C=80=E5=B0=8F=E5=8C=96?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=E5=90=8E=EF=BC=8C=E9=BA=A6?=
 =?UTF-8?q?=E5=85=8B=E9=A3=8E=E7=8A=B6=E6=80=81=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modulemain/activity/room/activity/RoomActivity.kt     | 8 +++++---
 .../activity/room/fragment/RoomKtvFragment.java           | 7 ++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index afd5be4a..74cc16c2 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -281,7 +281,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             taskId = intent.getStringExtra("taskId")
             mRoomInfoResp = roomInfoResp
         }
-       setView(mRoomInfoResp)
+       setView(mRoomInfoResp,true)
         toActivity(TransparentActivity::class.java)
         LogUtils.e("RoomActivity", "onNewIntent")
     }
@@ -2875,10 +2875,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                     return
                 }
 
-                if (userId == 0) {
+                if (userId == 0 && !CommonAppContext.getInstance().isMai) {
                     switchMic(2)
-                }else if (mRoomInfoResp?.user_info?.user_id == userId) {
+                }else if (mRoomInfoResp?.user_info?.user_id == userId && !CommonAppContext.getInstance().isMai) {
                     switchMic(2)
+                }else{
+                    switchMic(1)
                 }
             } else {
                 mBinding?.ivSoundEffects?.visibility = View.GONE
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
index d29116d6..21e51fef 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
@@ -25,6 +25,7 @@ import com.xscm.modulemain.dialog.RoomUserInfoFragment;
 import com.xscm.modulemain.dialog.TunerDialogFragment;
 import com.xscm.modulemain.generated.callback.OnClickListener;
 import com.xscm.moduleutil.base.BaseMvpFragment;
+import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.MusicSongBean;
 import com.xscm.moduleutil.bean.RedPacketInfo;
 import com.xscm.moduleutil.bean.RoomCharmRankBean;
@@ -176,7 +177,11 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 if (roomPitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
 
                     if (getActivity() instanceof RoomActivity) {
-                        ((RoomActivity) getActivity()).switchMic(2);
+                        if (!CommonAppContext.getInstance().isMai) {
+                            ((RoomActivity) getActivity()).switchMic(2);
+                        }else {
+                            ((RoomActivity) getActivity()).switchMic(1);
+                        }
                     }
                 }
             }