From 6d22c6a066fc79830d20ed5a6aa8d0ed4af43da2 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 17 Aug 2022 15:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B2=89=E4=B8=9D=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=88=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/adapter/FunGamesAdapter.java       |  1 +
 .../yunbao/common/dialog/LiveTotalDialog.java | 17 ++++++++++
 .../common/event/LiveAudienceEvent.java       |  4 ++-
 .../src/main/res/layout/view_live_total.xml   |  2 ++
 .../live/activity/LiveAudienceActivity.java   | 31 +++++++++++++++++++
 live/src/main/res/layout/dialog_fans.xml      | 16 +++++-----
 6 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/adapter/FunGamesAdapter.java b/common/src/main/java/com/yunbao/common/adapter/FunGamesAdapter.java
index f74361143..575baaa88 100644
--- a/common/src/main/java/com/yunbao/common/adapter/FunGamesAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/FunGamesAdapter.java
@@ -47,4 +47,5 @@ public class FunGamesAdapter extends RecyclerView.Adapter {
         activeModels.addAll(mActiveModels);
         notifyDataSetChanged();
     }
+
 }
diff --git a/common/src/main/java/com/yunbao/common/dialog/LiveTotalDialog.java b/common/src/main/java/com/yunbao/common/dialog/LiveTotalDialog.java
index 38001f978..461c09d44 100644
--- a/common/src/main/java/com/yunbao/common/dialog/LiveTotalDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/LiveTotalDialog.java
@@ -11,9 +11,12 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.yunbao.common.R;
 import com.yunbao.common.adapter.FunGamesAdapter;
 import com.yunbao.common.bean.ActiveModel;
+import com.yunbao.common.event.LiveAudienceEvent;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 import java.util.List;
 
@@ -59,6 +62,20 @@ public class LiveTotalDialog extends AbsDialogFragment {
                         ToastUtil.show(error);
                     }
                 });
+        //粉丝团
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.fan_club), () -> {
+                    Bus.get().post(new LiveAudienceEvent()
+                            .setType(LiveAudienceEvent.LiveAudienceType.FANCLUB));
+                    dismiss();
+                }
+        );
+        //守护
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.guard_layout), () -> {
+                    Bus.get().post(new LiveAudienceEvent()
+                            .setType(LiveAudienceEvent.LiveAudienceType.GUARD));
+                    dismiss();
+                }
+        );
 
     }
 
diff --git a/common/src/main/java/com/yunbao/common/event/LiveAudienceEvent.java b/common/src/main/java/com/yunbao/common/event/LiveAudienceEvent.java
index 9d7260f34..4513540b7 100644
--- a/common/src/main/java/com/yunbao/common/event/LiveAudienceEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/LiveAudienceEvent.java
@@ -29,7 +29,9 @@ public class LiveAudienceEvent extends BaseModel {
         SIDEBAR(1, "侧边栏"),
         BOTTOMCOLLECTION(2, "底部合集"),
         GIFTPOPUP(3, "礼物弹窗"),
-        CURRENTACTIVITY(4, "当前活动");
+        CURRENTACTIVITY(4, "当前活动"),
+        FANCLUB(5,"粉絲團"),
+        GUARD(6,"守護");
 
 
         private int type;
diff --git a/common/src/main/res/layout/view_live_total.xml b/common/src/main/res/layout/view_live_total.xml
index aed38e3c2..2adc652ca 100644
--- a/common/src/main/res/layout/view_live_total.xml
+++ b/common/src/main/res/layout/view_live_total.xml
@@ -37,6 +37,7 @@
         android:layout_marginTop="10dp">
 
         <LinearLayout
+            android:id="@+id/fan_club"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -58,6 +59,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/guard_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="28dp"
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 5873bf11e..5914912c1 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -44,6 +44,7 @@ import com.yunbao.common.HtmlConfig;
 import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.AnchorRecommendItemModel;
 import com.yunbao.common.bean.AnchorRecommendModel;
+import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.SlideInfoModel;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.custom.CommonRefreshView;
@@ -79,7 +80,9 @@ import com.yunbao.live.bean.LiveGuardInfo;
 import com.yunbao.live.bean.LivePKUserListBean;
 import com.yunbao.live.bean.LiveUserGiftBean;
 import com.yunbao.live.dialog.BlowkissDialog;
+import com.yunbao.live.dialog.LiveFansFragment;
 import com.yunbao.live.dialog.LiveGiftDialogFragment;
+import com.yunbao.live.dialog.LiveGuardDialogFragment;
 import com.yunbao.live.dialog.LiveHDDialogFragment;
 import com.yunbao.live.dialog.NewUserDialog;
 import com.yunbao.live.event.LinkMicTxAccEvent;
@@ -1407,6 +1410,7 @@ public class LiveAudienceActivity extends LiveActivity {
                 liveGiftDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
                 break;
             case CURRENTACTIVITY:
+
                 bundle.putString("url", event.getModel().activityUrl(mContext, liveBean.getUid()));
                 int show = TextUtils.isEmpty(event.getModel().getShowType()) ? 0 : Integer.parseInt(event.getModel().getShowType());
                 bundle.putInt("show_type", show);
@@ -1414,6 +1418,33 @@ public class LiveAudienceActivity extends LiveActivity {
                 liveHDDialogFragment.setArguments(bundle);
                 liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
                 break;
+            case FANCLUB:
+                IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
+                LiveFansFragment liveFansFragment = new LiveFansFragment();
+                //粉絲團粉絲團
+                //不是粉絲
+                if (LiveAudienceActivity.is_fans != null && LiveAudienceActivity.is_fans.equals("2")) {
+                    bundle.putString(Constants.URL,
+                            CommonAppConfig.HOST + "/h5/live/joinFansClub.html" +
+                                    "?uid=" + userInfo.getId() +
+                                    "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid);
+                } else {
+                    bundle.putString(Constants.URL,
+                            CommonAppConfig.HOST + "/h5/live/fansClub.html" +
+                                    "?uid=" + userInfo.getId() +
+                                    "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid);
+                }
+                liveFansFragment.setArguments(bundle);
+                liveFansFragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
+                break;
+            case GUARD:
+                LiveGuardDialogFragment liveGuardDialogFragment = new LiveGuardDialogFragment();
+                liveGuardDialogFragment.setLiveGuardInfo(mLiveGuardInfo);
+                bundle.putString(Constants.LIVE_UID, mLiveUid);
+                bundle.putBoolean(Constants.ANCHOR, mIsAnchor);
+                liveGuardDialogFragment.setArguments(bundle);
+                liveGuardDialogFragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
+                break;
         }
 
     }
diff --git a/live/src/main/res/layout/dialog_fans.xml b/live/src/main/res/layout/dialog_fans.xml
index f0928e404..b831809d1 100644
--- a/live/src/main/res/layout/dialog_fans.xml
+++ b/live/src/main/res/layout/dialog_fans.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="top|left"
-    android:background="@color/white">
+    android:orientation="vertical"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="16dp">
+
 
     <WebView
         android:id="@+id/rlWebview"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"/>
-
-</LinearLayout>
\ No newline at end of file
+        android:layout_height="match_parent"
+        android:layout_gravity="top" />
+</androidx.cardview.widget.CardView>
\ No newline at end of file