From 59678be822da773474ad2294918dc5f38c2caff2 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 10 Aug 2022 18:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,shouye=20ytuijian?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                 |  4 +-
 .../res/layout/rc_conversationlist_item.xml   |  4 +-
 .../yunbao/main/activity/MainActivity.java    | 48 +++++++++++--------
 .../yunbao/main/views/FloatBannerView.java    |  2 +-
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/config.gradle b/config.gradle
index 52cf2350b..5462f3fe9 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml
index f6afec7c4..ed57232d2 100644
--- a/live/src/main/res/layout/rc_conversationlist_item.xml
+++ b/live/src/main/res/layout/rc_conversationlist_item.xml
@@ -30,8 +30,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="22dp"
                 android:layout_alignParentBottom="true"
-                android:src="@mipmap/instructors"
-                android:visibility="visible" />
+                android:layout_marginBottom="-5dp"
+                android:visibility="gone" />
         </RelativeLayout>
 
         <LinearLayout
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index 80f233bdb..94e20c2b3 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -165,6 +165,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     private int messageNumber = 0, numberMe = 1;
     private ImageView waitingTip;
     private FloatBannerView floatBanner;
+    private boolean isClickfloatBanner = false;
 
 
     @Override
@@ -371,33 +372,38 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         findViewById(R.id.banner_click).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String Uid = floatBanner.getUid();
-                LiveNetManager.get(mContext)
-                        .getLiveInfo(String.valueOf(Uid), new com.yunbao.common.http.base.HttpCallback<LiveInfoModel>() {
-                            @Override
-                            public void onSuccess(LiveInfoModel data) {
+                if (!isClickfloatBanner) {
+                    isClickfloatBanner = true;
+                    String Uid = floatBanner.getUid();
+                    LiveNetManager.get(mContext)
+                            .getLiveInfo(String.valueOf(Uid), new com.yunbao.common.http.base.HttpCallback<LiveInfoModel>() {
+                                @Override
+                                public void onSuccess(LiveInfoModel data) {
 
-                                LiveRoomCheckLivePresenter mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, (liveBean, liveType, liveTypeVal, liveSdk) -> {
-                                    if (liveBean == null) {
-                                        return;
-                                    }
-                                    LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
+                                    LiveRoomCheckLivePresenter mCheckLivePresenter = new LiveRoomCheckLivePresenter(mContext, (liveBean, liveType, liveTypeVal, liveSdk) -> {
+                                        if (liveBean == null) {
+                                            return;
+                                        }
+                                        LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
 
-                                });
-                                //讲数据转成json
-                                String json = GsonUtils.toJson(data);
-                                LiveBean liveBean = GsonUtils.fromJson(json, LiveBean.class);
-                                mCheckLivePresenter.checkLive(liveBean);
+                                    });
+                                    //讲数据转成json
+                                    String json = GsonUtils.toJson(data);
+                                    LiveBean liveBean = GsonUtils.fromJson(json, LiveBean.class);
+                                    mCheckLivePresenter.checkLive(liveBean);
+                                    isClickfloatBanner = false;
+                                }
 
-                            }
+                                @Override
+                                public void onError(String error) {
 
-                            @Override
-                            public void onError(String error) {
+                                    RouteUtil.forwardUserHome(mContext, String.valueOf(Uid), 0);
+                                    isClickfloatBanner = false;
+                                }
+                            });
 
-                                RouteUtil.forwardUserHome(mContext, String.valueOf(Uid), 0);
+                }
 
-                            }
-                        });
             }
         });
         //选中监听
diff --git a/main/src/main/java/com/yunbao/main/views/FloatBannerView.java b/main/src/main/java/com/yunbao/main/views/FloatBannerView.java
index e1411e423..78df29c84 100644
--- a/main/src/main/java/com/yunbao/main/views/FloatBannerView.java
+++ b/main/src/main/java/com/yunbao/main/views/FloatBannerView.java
@@ -34,7 +34,7 @@ public class FloatBannerView extends FrameLayout {
     private ClipPathCircleImage clipImage1, clipImage2, clipImage3;
     private List<AnchorRecommendItemModel> list = new ArrayList<>();
     //默认定时器时间
-    private int delayMillis = 1500;
+    private int delayMillis = 1400;
     //Handler定时加载下一张的数据
     private Handler bannerHandler = new Handler();
     private int index = 0;