From 4481b102ef78884bf4af6a8e754b91f38828b16a Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 30 Nov 2022 19:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/views/CustomDrawerPopupView.java      |  2 +-
 config.gradle                                    |  2 +-
 .../live/activity/LiveAudienceActivity.java      | 16 ----------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java
index 1745aee68..e111905c0 100644
--- a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java
+++ b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java
@@ -59,7 +59,7 @@ public class CustomDrawerPopupView extends DrawerPopupView {
         Bus.getOn(this);
         super.onCreate();
         initView();
-
+        initData(null);
 
     }
 
diff --git a/config.gradle b/config.gradle
index 9b9ac5933..7a26c388d 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 307,
+            versionCode      : 308,
             versionName      : "6.4.5"
     ]
     manifestPlaceholders = [
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 c6cc6fa34..1b264bf68 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -41,7 +41,6 @@ import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.AnchorRecommendItemModel;
 import com.yunbao.common.bean.AnchorRecommendModel;
 import com.yunbao.common.bean.CrashSaveBean;
-import com.yunbao.common.bean.CustomSidebarInfoModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LinkMicUserBean;
 import com.yunbao.common.bean.LiveBean;
@@ -60,7 +59,6 @@ import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
-import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.http.main.MainNetManager;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
@@ -308,19 +306,7 @@ public class LiveAudienceActivity extends LiveActivity {
 
         });
         getDrawer();
-        //侧边栏
-        LiveNetManager.get(mContext)
-                .getCustomSidebarInfo(new com.yunbao.common.http.base.HttpCallback<List<CustomSidebarInfoModel>>() {
-                    @Override
-                    public void onSuccess(List<CustomSidebarInfoModel> data) {
-                        customSidebarInfoModels = data;
-                    }
 
-                    @Override
-                    public void onError(String error) {
-                        ToastUtil.show(error);
-                    }
-                });
     }
 
     private void loadData(ViewGroup viewGroup, int currentItem) {
@@ -912,7 +898,6 @@ public class LiveAudienceActivity extends LiveActivity {
 
                                 @Override
                                 public void onShow(BasePopupView popupView) {
-                                    customDrawerPopupView.initData(customSidebarInfoModels);
                                 }
 
                                 @Override
@@ -1293,7 +1278,6 @@ public class LiveAudienceActivity extends LiveActivity {
      */
     private List<SlideInfoModel> slideInfoModels = new ArrayList<>();
     private List<AnchorRecommendItemModel> list = new ArrayList<>();
-    private List<CustomSidebarInfoModel> customSidebarInfoModels = new ArrayList<>();
 
     private void getDrawer() {