From 7bbe82d72ca9bab23dc6e01225e73c804c507254 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 24 Aug 2022 09:52:23 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=85=A5=E5=8F=A3=20update:LiveHDDialogFragm?=
 =?UTF-8?q?ent=E6=96=B0=E5=A2=9E=E5=85=A8=E5=B1=8F=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/view_live_total.xml   |  1 +
 .../live/activity/LiveAudienceActivity.java   | 11 +++++++++++
 .../live/dialog/LiveHDDialogFragment.java     | 19 ++++++++++++++++++-
 .../yunbao/live/dialog/LiveTotalDialog.java   |  6 ++++++
 .../yunbao/live/event/LiveAudienceEvent.java  |  4 ++--
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/common/src/main/res/layout/view_live_total.xml b/common/src/main/res/layout/view_live_total.xml
index d03efb5ec..5408563cc 100644
--- a/common/src/main/res/layout/view_live_total.xml
+++ b/common/src/main/res/layout/view_live_total.xml
@@ -126,6 +126,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/activity_center"
             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 d3458c640..05da0f2ab 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -819,6 +819,17 @@ public class LiveAudienceActivity extends LiveActivity {
                 mLiveGuardInfo = event.getParametersModel().getmLiveGuardInfo() == null ?
                         mLiveGuardInfo : event.getParametersModel().getmLiveGuardInfo();
                 break;
+            case ACTIVITY_CENTER://活动中心
+                String url = CommonAppConfig.HOST + "/h5/live/hallOfFame/index.html?g=Appapi&m=Turntable&a=tricky";
+                url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+                        + CommonAppConfig.getInstance().getToken() + "&anchorUid=" + mLiveUid;
+                Log.i("tag", url);
+                Bundle bundle1 = new Bundle();
+                bundle1.putString("url", url);
+                liveHDDialogFragment = new LiveHDDialogFragment(true);
+                liveHDDialogFragment.setArguments(bundle1);
+                liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
+                break;
 
         }
 
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
index 9adf0a9d8..59dd56382 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java
@@ -37,6 +37,19 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
 
     private WebView mWebView;
     private int showType = 0;
+    private boolean isFullWindow=false;
+
+    public LiveHDDialogFragment() {
+
+    }
+
+    /**
+     * 弹出全屏对话框
+     * @param isFullWindow 是否为全屏模式
+     */
+    public LiveHDDialogFragment(boolean isFullWindow) {
+        this.isFullWindow = isFullWindow;
+    }
 
     @Override
     protected int getLayoutId() {
@@ -59,7 +72,11 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
         window.setWindowAnimations(R.style.bottomToTopAnim);
         WindowManager.LayoutParams params = window.getAttributes();
         params.width = WindowManager.LayoutParams.MATCH_PARENT;
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        if(isFullWindow){
+            params.height = WindowManager.LayoutParams.MATCH_PARENT;
+        }else {
+            params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        }
         params.gravity = Gravity.BOTTOM;
         window.setAttributes(params);
     }
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java
index 1d53b8877..38efe3e37 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveTotalDialog.java
@@ -109,6 +109,12 @@ public class LiveTotalDialog extends AbsDialogFragment {
                     dismiss();
                 }
         );
+        //活动中心
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.activity_center),()->{
+            Bus.get().post(new LiveAudienceEvent()
+                    .setType(LiveAudienceEvent.LiveAudienceType.ACTIVITY_CENTER));
+            dismiss();
+        });
     }
 
     @Override
diff --git a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
index a60d19a5f..c73e74afc 100644
--- a/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
+++ b/live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
@@ -58,8 +58,8 @@ public class LiveAudienceEvent extends BaseModel {
         LIAN_MAI(9, "连麦"),
         EFFECTS_SETTINGS(10, "特效設置"),
         WISH_LIST(11, "心愿单"),
-        OPEN_PARAMETERS(12, "开放参数");
-
+        OPEN_PARAMETERS(12, "开放参数"),
+        ACTIVITY_CENTER(13, "活動中心");
 
         private int type;
         private String name;