From ba92e34b7dbdc2fe34e98fc3a628ebecc5108bfe Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 31 Aug 2022 14:31:51 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E8=B0=83=E6=95=B4Banner?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=20update=EF=BC=9A=E8=B0=83=E6=95=B4=E5=AE=88?=
 =?UTF-8?q?=E6=8A=A4=E5=B8=AD=E4=BD=8D=E7=BD=AE=20update=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A7=82=E4=BC=97=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 live/src/main/res/layout/item_live_user.xml   |  2 +
 live/src/main/res/layout/view_live_room.xml   | 63 ++++++++++---------
 .../main/adapter/MainHomeLiveAdapter.java     |  2 +-
 .../res/layout/item_main_home_live_head.xml   |  2 +-
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/live/src/main/res/layout/item_live_user.xml b/live/src/main/res/layout/item_live_user.xml
index dc0ef1fae..0b359dcdd 100644
--- a/live/src/main/res/layout/item_live_user.xml
+++ b/live/src/main/res/layout/item_live_user.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/live_user_root_layout"
     android:layout_width="38dp"
+    android:layout_marginEnd="5dp"
     android:layout_height="38dp">
 
     <!--    <ImageView-->
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 5197283d9..dac81761b 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -153,8 +153,8 @@
                 android:layout_width="34dp"
                 android:layout_height="34dp"
                 android:layout_marginEnd="5dp"
-                android:src="@mipmap/live_icon_focus"
                 android:gravity="center"
+                android:src="@mipmap/live_icon_focus"
                 android:textColor="@color/white"
                 android:visibility="visible" />
 
@@ -170,6 +170,33 @@
 
         </LinearLayout>
 
+        <RelativeLayout
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:layout_gravity="center"
+            android:layout_marginStart="8dp"
+            android:scaleType="centerCrop">
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/user_guard"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:scaleType="centerCrop"
+                android:src="@mipmap/img_guardian_empty"
+                app:riv_oval="true" />
+
+
+            <com.opensource.svgaplayer.SVGAImageView
+                android:id="@+id/gift_svga"
+                android:layout_width="38dp"
+                android:layout_height="38dp"
+                android:src="@drawable/img_guardian_online"
+                android:visibility="gone"
+                app:autoPlay="true" />
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -181,50 +208,24 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="end|center"
                 android:layout_alignParentRight="true"
+                android:gravity="end|center"
                 android:orientation="horizontal">
 
-                <RelativeLayout
-                    android:layout_width="38dp"
-                    android:layout_height="38dp"
-                    android:layout_gravity="center"
-                    android:scaleType="centerCrop">
-
-                    <com.makeramen.roundedimageview.RoundedImageView
-                        android:id="@+id/user_guard"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_centerInParent="true"
-                        android:scaleType="centerCrop"
-                        android:src="@mipmap/img_guardian_empty"
-                        app:riv_oval="true" />
-
-
-                    <com.opensource.svgaplayer.SVGAImageView
-                        android:id="@+id/gift_svga"
-                        android:layout_width="38dp"
-                        android:layout_height="38dp"
-                        android:src="@drawable/img_guardian_online"
-                        android:visibility="gone"
-                        app:autoPlay="true" />
-
-                </RelativeLayout>
-
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/user_recyclerView"
                     android:layout_width="80dp"
-                    android:layout_gravity="end|center"
                     android:layout_height="40dp"
+                    android:layout_gravity="end|center"
                     android:layout_marginRight="-3dp"
                     android:overScrollMode="never" />
 
                 <ImageView
                     android:id="@+id/user_more"
                     android:layout_width="30dp"
-                    android:layout_gravity="center"
                     android:layout_height="40dp"
+                    android:layout_gravity="center"
                     android:src="@mipmap/live_users_more" />
 
                 <ImageView
@@ -1862,9 +1863,9 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/room_fast_msg"
             android:layout_width="match_parent"
-            android:layout_marginStart="10dp"
             android:layout_height="30dp"
             android:layout_alignParentBottom="true"
+            android:layout_marginStart="10dp"
             android:visibility="gone" />
     </RelativeLayout>
 
diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
index 8b6744437..74bd1d236 100644
--- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
@@ -57,7 +57,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
         this.context = context;
         this.Height = h;
         mHeadView = mInflater.inflate(R.layout.item_main_home_live_head, null, false);
-        mHeadView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dp2px(140)));
+        mHeadView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dp2px(120)));
     }
 
     public View getHeadView() {
diff --git a/main/src/main/res/layout/item_main_home_live_head.xml b/main/src/main/res/layout/item_main_home_live_head.xml
index 348ef45bd..c1c032c7f 100644
--- a/main/src/main/res/layout/item_main_home_live_head.xml
+++ b/main/src/main/res/layout/item_main_home_live_head.xml
@@ -14,7 +14,7 @@
         <com.ms.banner.Banner
             android:id="@+id/banner"
             android:layout_width="match_parent"
-            android:layout_height="130dp"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="3dp"
             android:layout_marginBottom="5dp"
             app:delay_time="3000"