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(), 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(), 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