From 721172d48aeda7a4067f89f2761ed4b1eee76b38 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 5 Dec 2022 17:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=82=E4=BC=97=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E9=97=B4PortraitLiveManager=E7=9A=84=E5=BC=BA?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=AF=BC=E8=87=B4=E7=9A=84=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yunbao/live/activity/LiveActivity.java    | 6 +++---
 .../java/com/yunbao/live/activity/LiveAudienceActivity.java | 2 +-
 .../java/com/yunbao/live/dialog/LiveMoreDialogFragment.java | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
index d6845d854..9ad278b22 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
@@ -105,7 +105,7 @@ import java.util.TreeMap;
  */
 
 public abstract class LiveActivity extends AbsActivity implements SocketMessageListener, LiveShareDialogFragment.ActionListener, KeyBoardHeightChangeListener {
-
+    public String anyway;
     public ViewGroup mContainer;
     protected ViewGroup mPageContainer;
     protected LiveRoomViewHolder mLiveRoomViewHolder;
@@ -618,9 +618,9 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
      */
     @Override
     public void onLinkMicAnchorPlayUrl(String pkUid, String playUrl) {
-        if (LiveAudienceActivity.anyway == null) {
+        if (anyway == null) {
             mLiveLinkMicAnchorPresenter.onLinkMicAnchorPlayUrl(pkUid, playUrl);
-        } else if (mLiveLinkMicAnchorPresenter != null && LiveAudienceActivity.anyway.equals("0")) {
+        } else if (mLiveLinkMicAnchorPresenter != null && anyway.equals("0")) {
             mLiveLinkMicAnchorPresenter.onLinkMicAnchorPlayUrl(pkUid, playUrl);
         }
         if (this instanceof LiveAudienceActivity) {
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 289f779b0..eab3f9cb2 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -116,7 +116,7 @@ import java.util.List;
 public class LiveAudienceActivity extends LiveActivity {
 
     private static final String TAG = "LiveAudienceActivity";
-    public static String anyway;
+
     public JSONObject pkInfo;
     public static LiveAudienceActivity liveAudienceActivity;
 
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveMoreDialogFragment.java
index 10fa1a78e..3e54fd76f 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveMoreDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveMoreDialogFragment.java
@@ -60,7 +60,10 @@ public class LiveMoreDialogFragment extends AbsDialogFragment {
             @Override
             public void onClick(View v) {
                 dismiss();
-                if (((LiveAudienceActivity) mContext).pkInfo != null && ((LiveAudienceActivity) mContext).pkInfo.getIntValue("ifpk") == 0 && ((LiveAudienceActivity) mContext).anyway.equals("1") && LiveRoomViewHolder.d_pk_view.getVisibility() != View.VISIBLE) {
+                if (mContext instanceof LiveAudienceActivity && (((LiveAudienceActivity) mContext).pkInfo != null &&
+                        ((LiveAudienceActivity) mContext).pkInfo.getIntValue("ifpk") == 0 &&
+                        ((LiveAudienceActivity) mContext).anyway.equals("1") &&
+                        LiveRoomViewHolder.d_pk_view.getVisibility() != View.VISIBLE)) {
                     ((LiveAudienceActivity) mContext).btnSmallScreen.setVisibility(View.VISIBLE);
                     ((LiveAudienceActivity) mContext).setCurrentItem(0);
                     ((LiveAudienceActivity) mContext).getmLivePlayViewHolder().fullScreen();