From 53f26aee68f61cb79e4578e68f9f8d3eece902a5 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Thu, 19 Sep 2024 17:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 live/src/main/res/layout/item_live_user1.xml | 30 +++++++++++---------
 live/src/main/res/layout/view_live_room.xml  | 30 +++++++++++---------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/live/src/main/res/layout/item_live_user1.xml b/live/src/main/res/layout/item_live_user1.xml
index 87273f85e..00e7edc0c 100644
--- a/live/src/main/res/layout/item_live_user1.xml
+++ b/live/src/main/res/layout/item_live_user1.xml
@@ -2,33 +2,35 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="40dp"
-    android:layout_height="40dp">
+    android:layout_width="wrap_content"
+    android:layout_height="36dp">
 
     <com.yunbao.common.views.weight.ClipPathCircleImage
         android:id="@+id/avatar"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_centerInParent="true"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:scaleType="centerCrop"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintHeight_percent="0.8"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintDimensionRatio="1"
+        android:scaleType="centerCrop"
         app:riv_oval="true"
         tools:src="@drawable/m_chu_xia" />
 
     <com.opensource.svgaplayer.SVGAImageView
         android:id="@+id/gift_svga"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
         app:autoPlay="true"
-        app:layout_constraintBottom_toBottomOf="@+id/avatar"
-        app:layout_constraintEnd_toEndOf="@+id/avatar"
-        app:layout_constraintStart_toStartOf="@+id/avatar"
-        app:layout_constraintTop_toTopOf="@+id/avatar" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintHeight_percent="0.96"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintDimensionRatio="1"
+        tools:src="@mipmap/img_guardian_online" />
 
     <ImageView
         android:id="@+id/icon"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 548ac0ab8..2ebf5b3ba 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -11,13 +11,13 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/lin"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="34dp"
         android:layout_marginTop="25dp">
 
         <View
             android:id="@+id/group_1"
             android:layout_width="0dp"
-            android:layout_height="38dp"
+            android:layout_height="match_parent"
             android:layout_marginStart="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="3.852"
@@ -124,9 +124,9 @@
         <!-- 这些事靠右的-->
         <ImageView
             android:id="@+id/btn_close"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
-            android:layout_marginEnd="12dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginEnd="10dp"
             android:src="@mipmap/icon_live_close_4"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1"
@@ -135,8 +135,8 @@
 
         <ImageView
             android:id="@+id/user_more"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
             android:layout_marginEnd="6dp"
             android:src="@mipmap/live_users_more_2"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -145,12 +145,13 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/user_recyclerView"
-            android:layout_width="120dp"
+            android:layout_width="108dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="3dp"
+            android:layout_marginEnd="4dp"
             android:orientation="horizontal"
             android:overScrollMode="never"
             android:visibility="visible"
+            tools:listitem="@layout/item_live_user1"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/user_more"
             app:layout_constraintTop_toTopOf="parent"
@@ -158,10 +159,10 @@
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/user_guard"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:layout_centerInParent="true"
-            android:layout_marginEnd="3dp"
+            android:layout_marginEnd="6dp"
             android:scaleType="centerCrop"
             android:src="@mipmap/img_guardian_empty"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -173,9 +174,10 @@
 
         <com.opensource.svgaplayer.SVGAImageView
             android:id="@+id/gift_svga"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
             android:src="@mipmap/img_guardian_online"
+            app:layout_constraintDimensionRatio="1"
             android:visibility="gone"
             app:autoPlay="true"
             app:layout_constraintBottom_toBottomOf="@+id/user_guard"