YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:修改最小化进入房间后，麦克风状态变化

Browse Source
This commit is contained in:
梁小江
2025-12-25 18:40:41 +08:00
parent 8b24d3ace5
commit d6efdefc99
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
taskId = intent.getStringExtra("taskId") taskId = intent.getStringExtra("taskId")
mRoomInfoResp = roomInfoResp mRoomInfoResp = roomInfoResp
} }
setView(mRoomInfoResp) setView(mRoomInfoResp,true)
toActivity(TransparentActivity::class.java) toActivity(TransparentActivity::class.java)
LogUtils.e("RoomActivity", "onNewIntent") LogUtils.e("RoomActivity", "onNewIntent")
} }
@@ -2875,10 +2875,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
return return
} }
if (userId == 0) { if (userId == 0 && !CommonAppContext.getInstance().isMai) {
switchMic(2) switchMic(2)
}else if (mRoomInfoResp?.user_info?.user_id == userId) { }else if (mRoomInfoResp?.user_info?.user_id == userId && !CommonAppContext.getInstance().isMai) {
switchMic(2) switchMic(2)
}else{
switchMic(1)
} }
} else { } else {
mBinding?.ivSoundEffects?.visibility = View.GONE mBinding?.ivSoundEffects?.visibility = View.GONE

5
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
View File

@@ -25,6 +25,7 @@ import com.xscm.modulemain.dialog.RoomUserInfoFragment;
import com.xscm.modulemain.dialog.TunerDialogFragment; import com.xscm.modulemain.dialog.TunerDialogFragment;
import com.xscm.modulemain.generated.callback.OnClickListener; import com.xscm.modulemain.generated.callback.OnClickListener;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.MusicSongBean; import com.xscm.moduleutil.bean.MusicSongBean;
import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean; 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 (roomPitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
if (getActivity() instanceof RoomActivity) { if (getActivity() instanceof RoomActivity) {
if (!CommonAppContext.getInstance().isMai) {
((RoomActivity) getActivity()).switchMic(2); ((RoomActivity) getActivity()).switchMic(2);
}else {
((RoomActivity) getActivity()).switchMic(1);
}
} }
} }
} }