diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 8042946c4..ff0cc0104 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -982,6 +982,10 @@ public class LiveAudienceActivity extends LiveActivity { if (event.getMicIng() == 1) { manager.micIngTypeOne(event.getBean(), event.getLiveType(), event.getLiveTypeVal()); } else if (event.getMicIng() == 2) { + if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_OPEN) { + MicStatusManager.getInstance().showDownMicDialog(mContext); + return; + } manager.micIngTypeTwo(event.getBean(), event.getLiveType(), event.getLiveTypeVal()); } else { //获取房间连麦状态 diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 3b2889fa6..72767fbc4 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -268,8 +268,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLivePlayViewHolder.setOnMicCallback(new LiveRoomPlayViewHolder.OnMicCallback() { @Override public void onMikUpdate() { - if(mContext instanceof LiveActivity) { - ((LiveActivity) mContext).showMicList(mLiveBean.getUid(),mLiveRoomViewHolder); + if (mContext instanceof LiveActivity) { + ((LiveActivity) mContext).showMicList(mLiveBean.getUid(), mLiveRoomViewHolder); } } }); @@ -520,13 +520,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.showLiveRoomActivityBanner(); } }); - if(mContext instanceof LiveActivity) { - ((LiveActivity) mContext).showMicList(mLiveBean.getUid(),mLiveRoomViewHolder); + if (mContext instanceof LiveActivity) { + ((LiveActivity) mContext).showMicList(mLiveBean.getUid(), mLiveRoomViewHolder); } } - public void removeLiveEnd() { if (mLiveAudienceViewHolder != null) {