1:修改最小化进入房间后,麦克风状态变化
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user