From 030fdb6ad0e47c749b58ed389807ebbd58c5eb25 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 29 Nov 2022 14:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E5=9C=A8=E8=BF=9E?=
 =?UTF-8?q?=E9=BA=A6=E4=B8=AD=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=BF=E6=92=AD=E8=B7=B3=E8=BD=AC=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/live/activity/LiveAudienceActivity.java   | 4 ++++
 .../java/com/yunbao/live/views/PortraitLiveManager.java  | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

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) {