From d3a3569f2b9ef0d01d7d38790e6c8db7887926ce Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 17 Aug 2022 16:40:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B5=E6=97=8F,=E8=BF=9E?=
 =?UTF-8?q?=E9=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/common/dialog/LiveTotalDialog.java | 14 +++++++
 .../common/event/LiveAudienceEvent.java       |  8 ++--
 .../com/yunbao/common/http/PDLiveApi.java     |  5 +++
 .../src/main/res/layout/view_live_total.xml   |  2 +
 .../live/activity/LiveAudienceActivity.java   | 42 +++++++++++++++++--
 5 files changed, 65 insertions(+), 6 deletions(-)

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 b648094da..d184ba39b 100644
--- a/common/src/main/java/com/yunbao/common/dialog/LiveTotalDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/LiveTotalDialog.java
@@ -83,6 +83,20 @@ public class LiveTotalDialog extends AbsDialogFragment {
                     dismiss();
                 }
         );
+        //贵族
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.noble_layout), () -> {
+                    Bus.get().post(new LiveAudienceEvent()
+                            .setType(LiveAudienceEvent.LiveAudienceType.NOBLE));
+                    dismiss();
+                }
+        );
+        //连麦
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.live_link_mic), () -> {
+                    Bus.get().post(new LiveAudienceEvent()
+                            .setType(LiveAudienceEvent.LiveAudienceType.LIANMAI));
+                    dismiss();
+                }
+        );
     }
 
     @Override
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 5ec9b4185..e4276d3fa 100644
--- a/common/src/main/java/com/yunbao/common/event/LiveAudienceEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/LiveAudienceEvent.java
@@ -30,9 +30,11 @@ public class LiveAudienceEvent extends BaseModel {
         BOTTOMCOLLECTION(2, "底部合集"),
         GIFTPOPUP(3, "礼物弹窗"),
         CURRENTACTIVITY(4, "当前活动"),
-        FANCLUB(5,"粉絲團"),
-        GUARD(6,"守護"),
-        LIVEWKS(7,"周星榜");
+        FANCLUB(5, "粉絲團"),
+        GUARD(6, "守護"),
+        LIVEWKS(7, "周星榜"),
+        NOBLE(8, "贵族"),
+        LIANMAI(9, "连麦");
 
 
         private int type;
diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index 7f32922ae..a465f85a2 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -148,4 +148,9 @@ public interface PDLiveApi {
      */
     @GET("/api/public/?service=Active.getActiveList")
     Observable<ResponseModel<List<ActiveModel>>> getActiveList();
+    /**
+     * 获取活动
+     */
+    @GET("/api/public/?service=live.getDrLm")
+    Observable<ResponseModel<List<ActiveModel>>> getDrLm();
 }
diff --git a/common/src/main/res/layout/view_live_total.xml b/common/src/main/res/layout/view_live_total.xml
index 7587258b2..ea0bce7ae 100644
--- a/common/src/main/res/layout/view_live_total.xml
+++ b/common/src/main/res/layout/view_live_total.xml
@@ -82,6 +82,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/noble_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="28dp"
@@ -164,6 +165,7 @@
         android:layout_marginBottom="20dp">
 
         <LinearLayout
+            android:id="@+id/live_link_mic"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
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 d71765e03..398ac2b8c 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -84,6 +84,7 @@ 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.LiveMicUserDialogFragment;
 import com.yunbao.live.dialog.NewUserDialog;
 import com.yunbao.live.event.LinkMicTxAccEvent;
 import com.yunbao.live.event.LiveRoomChangeEvent;
@@ -1386,6 +1387,11 @@ public class LiveAudienceActivity extends LiveActivity {
         });
     }
 
+    /**
+     * 跳转页面或者弹窗展示
+     *
+     * @param event
+     */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onOpenDrawer(LiveAudienceEvent event) {
         Bundle bundle = new Bundle();
@@ -1446,11 +1452,41 @@ public class LiveAudienceActivity extends LiveActivity {
                 liveGuardDialogFragment.setArguments(bundle);
                 liveGuardDialogFragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
                 break;
-            case LIVEWKS:
-                String url = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+            case LIVEWKS://周星榜
+                String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
                         + userInfo.getId() +
                         "&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
-                ZhuangBanActivity.forward(mContext, url, false);
+                ZhuangBanActivity.forward(mContext, weeklyStarUrl, false);
+                break;
+            case NOBLE:
+                Constants.isTitle = true;
+                String nobleUrl = CommonAppConfig.HOST + "/h5/Nobility.html?nickname=" + userInfo.getUserNicename()
+                        + "&usernobId=" + userInfo.getNobleId()
+                        + "&token=" + userInfo.getToken()
+                        + "&uid=" + userInfo.getId();
+                ZhuangBanActivity.forward(mContext, nobleUrl, false);
+                break;
+            case LIANMAI:
+                //获取房间连麦状态
+                HttpClient.getInstance().get("live.getDrLm", "live.getDrLm")
+                        .params("uid", mLiveUid, true)
+                        .execute(new HttpCallback() {
+                            @Override
+                            public void onSuccess(int code, String msg, String[] info) {
+                                if (code == 0) {
+                                    LiveMicUserDialogFragment fragment = new LiveMicUserDialogFragment();
+                                    Bundle bundle = new Bundle();
+                                    bundle.putString(Constants.LIVE_UID, mLiveUid);
+                                    bundle.putString(Constants.STREAM, mStream);
+                                    bundle.putString("By", "1");
+                                    fragment.setArguments(bundle);
+                                    fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveUserMoreDialogFragment");
+                                    LiveMicUserDialogFragment.activity = ((LiveAudienceActivity) mContext);
+                                } else {
+                                    ToastUtil.show(R.string.no_mic_opn);
+                                }
+                            }
+                        });
                 break;
 
         }