From 05c490672d1115a80a57412742ab300abe2de413 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 28 Sep 2022 15:08:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E6=92=AD=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E8=8A=82=E7=9B=AE=E5=91=A8=E6=98=9F=E6=A6=9C=E5=92=8C?=
 =?UTF-8?q?=E5=BF=83=E6=84=BF=E5=8D=95=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/dialog_live_new_function.xml   |  2 +-
 .../live/activity/LiveRyAnchorActivity.java   | 32 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/common/src/main/res/layout/dialog_live_new_function.xml b/common/src/main/res/layout/dialog_live_new_function.xml
index 71b870fd4..234b8cb67 100644
--- a/common/src/main/res/layout/dialog_live_new_function.xml
+++ b/common/src/main/res/layout/dialog_live_new_function.xml
@@ -264,7 +264,7 @@
                 android:layout_marginStart="23dp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <ImageView
                     android:layout_width="40dp"
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
index 47696dae4..342a6393d 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
@@ -35,6 +35,7 @@ import com.tencent.trtc.TRTCCloudDef;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
+import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.dialog.NotCancelableDialog;
 import com.yunbao.common.event.LoginInvalidEvent;
@@ -43,6 +44,8 @@ import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.http.JsonBean;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DateFormatUtil;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.DpUtil;
@@ -62,7 +65,9 @@ import com.yunbao.live.dialog.LiveLinkMicListDialogFragment;
 import com.yunbao.live.dialog.LiveMicUserDialogFragment;
 import com.yunbao.live.dialog.LiveNewFunctionDialogFragment;
 import com.yunbao.live.dialog.LiveNewWishListDialogFragment;
+import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
 import com.yunbao.live.event.LinkMicTxMixStreamEvent;
+import com.yunbao.live.event.LiveAudienceEvent;
 import com.yunbao.live.http.LiveHttpConsts;
 import com.yunbao.live.http.LiveHttpUtil;
 import com.yunbao.live.interfaces.LiveFunctionClickListener;
@@ -147,6 +152,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
     @Override
     protected void main() {
         super.main();
+        Bus.getOn(this);
         Intent intent = getIntent();
         mLiveSDK = intent.getIntExtra(Constants.LIVE_SDK, Constants.LIVE_SDK_KSY);
         mLiveKsyConfigBean = intent.getParcelableExtra(Constants.LIVE_KSY_CONFIG);
@@ -223,6 +229,8 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                 ToastUtil.show("開發中，敬請期待");
                 break;
             case Constants.LIVE_FUNC_MIC://語音
+                ToastUtil.show("開發中，敬請期待");
+                /*  //连麦说是有问题，暂时隐藏
                 LiveMicUserDialogFragment fragment = new LiveMicUserDialogFragment();
                 Bundle bundle = new Bundle();
                 bundle.putString(Constants.LIVE_UID, mLiveUid);
@@ -230,7 +238,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                 bundle.putString("By", "1");
                 fragment.setArguments(bundle);
                 fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveUserMoreDialogFragment");
-                LiveMicUserDialogFragment.activity = ((LiveRyAnchorActivity) mContext);
+                LiveMicUserDialogFragment.activity = ((LiveRyAnchorActivity) mContext);*/
                 break;
             case Constants.LIVE_FUNC_DR://多人PK
                 if (isDRPK != 1) {
@@ -889,6 +897,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
         mLiveReadyViewHolder=null;
         mLiveAnchorViewHolder=null;
         L.e("LiveAnchorActivity-------onDestroy------->");
+        Bus.getOff(this);
     }
 
 
@@ -1275,4 +1284,25 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
         L.e(TAG, content);
         LogUtil.print(mLogFile, content);
     }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onOpenDrawer(LiveAudienceEvent event) {
+        Bundle bundle = new Bundle();
+        IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
+        switch (event.getType()) {
+            case LIVE_WKS:
+                String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+                        + userInfo.getId() +
+                        "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
+                ZhuangBanActivity.forward(mContext, weeklyStarUrl, false);
+                break;
+            case WISH_LIST:
+                LiveWishListDialogFragment4Audience fragment4Audience = new LiveWishListDialogFragment4Audience();
+                bundle.putString(Constants.LIVE_UID, mLiveUid);
+                fragment4Audience.setArguments(bundle);
+                if (mContext instanceof LiveRyAnchorActivity) {
+                    fragment4Audience.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment4Audience");
+                }
+                break;
+        }
+    }
 }