From 218525d51c8cdb35b7b7039b2ad75fb8a8b0f3fe Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 31 Aug 2022 14:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E9=96=93UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/item_sidebar_lives.xml    |   2 +-
 .../res/mipmap-xxhdpi/bg_main_item_bottom.png | Bin 0 -> 4278 bytes
 .../live/activity/LiveAudienceActivity.java   |  18 +++++++++---------
 live/src/main/res/layout/view_live_room.xml   |   6 ++----
 4 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 common/src/main/res/mipmap-xxhdpi/bg_main_item_bottom.png

diff --git a/common/src/main/res/layout/item_sidebar_lives.xml b/common/src/main/res/layout/item_sidebar_lives.xml
index 081fae6d0..48875a68d 100644
--- a/common/src/main/res/layout/item_sidebar_lives.xml
+++ b/common/src/main/res/layout/item_sidebar_lives.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="25dp"
             android:layout_gravity="bottom"
-            android:background="#10000000" />
+            android:background="@mipmap/bg_main_item_bottom" />
 
         <TextView
             android:id="@+id/name"
diff --git a/common/src/main/res/mipmap-xxhdpi/bg_main_item_bottom.png b/common/src/main/res/mipmap-xxhdpi/bg_main_item_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8efdde702d6e508d5ad15d606ac3fe602536706
GIT binary patch
literal 4278
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

literal 0
HcmV?d00001

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 ec9275a78..a6a2bb6f4 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -255,7 +255,14 @@ public class LiveAudienceActivity extends LiveActivity {
         } else {
             liveHandler.post(liveRunnable);
         }
-
+        Log.e("收到socket--->", "mLiveUid--------------------------->" + mLiveUid);
+        //加载当前页面数据
+        View rootView = manager.getRootView();
+        if (rootView.getParent() != null && rootView.getParent() instanceof ViewGroup) {
+            ((ViewGroup) (rootView.getParent())).removeView(rootView);
+            manager.onRemove();
+        }
+        mViewGroup.addView(manager.getRootView());
     }
 
     //获取直播间状态
@@ -294,14 +301,7 @@ public class LiveAudienceActivity extends LiveActivity {
                     mAncherName = liveBean1.getUserNiceName();
                     mAncherIcon = liveBean1.getAvatar();
 
-                    Log.e("收到socket--->", "mLiveUid--------------------------->" + mLiveUid);
-                    //加载当前页面数据
-                    View rootView = manager.getRootView();
-                    if (rootView.getParent() != null && rootView.getParent() instanceof ViewGroup) {
-                        ((ViewGroup) (rootView.getParent())).removeView(rootView);
-                        manager.onRemove();
-                    }
-                    mViewGroup.addView(manager.getRootView());
+
                     manager.onAdd(liveBean1, liveType, liveTypeVal, liveSdk);
 
                 });
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 6a6fd9045..5197283d9 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -150,11 +150,9 @@
 
             <ImageView
                 android:id="@+id/btn_follow"
-                android:layout_width="23dp"
-                android:layout_height="23dp"
-                android:layout_marginTop="3dp"
+                android:layout_width="34dp"
+                android:layout_height="34dp"
                 android:layout_marginEnd="5dp"
-                android:layout_marginBottom="3dp"
                 android:src="@mipmap/live_icon_focus"
                 android:gravity="center"
                 android:textColor="@color/white"