From ade837e85c556c43297505cc071e0764c8c0c2d3 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 15 Jul 2024 10:06:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A4=BC=E7=89=A9=E5=A2=99=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/GiftWallMainTab1Fragment.java    |  4 ++--
 .../fragment/GiftWallMainTab2Fragment.java    |  4 ++--
 .../layout/fragment_gift_wall_man_tab_1.xml   | 14 ++++++------
 .../layout/fragment_gift_wall_man_tab_2.xml   |  8 +++++--
 .../layout/item_gift_wall_man_tab1_list_1.xml | 22 +++++++++----------
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java
index 21f2685fb..9ee8ae7af 100644
--- a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java
@@ -165,8 +165,8 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
         recyclerView1.setAdapter(list1Adapter);
         recyclerView2.setAdapter(list2Adapter);
 
-        recyclerView1.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(10), 1));
-        recyclerView2.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(2), 1));
+        recyclerView1.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(10),  DpUtil.dp2px(11)));
+        recyclerView2.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(2),  DpUtil.dp2px(11)));
 
         starGiftsTitle.getPaint().setShader(new LinearGradient(0, 0, 0, classicGiftsTitle.getPaint().getTextSize(),
                 Color.parseColor("#FEE8C6"), Color.parseColor("#FFD5A3"), Shader.TileMode.CLAMP));
diff --git a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
index 3eb235a0f..745cbfa76 100644
--- a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
@@ -106,8 +106,8 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
         recyclerView2.setAdapter(list2Adapter);
 
 
-        recyclerView1.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(2), 1));
-        recyclerView2.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(2), 1));
+        recyclerView1.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(2),  DpUtil.dp2px(10)));
+        recyclerView2.addItemDecoration(new ItemDecoration(getContext(), 0x00000000, DpUtil.dp2px(2),  DpUtil.dp2px(10)));
 
         starGiftsTitle.getPaint().setShader(new LinearGradient(0, 0, 0, classicGiftsTitle.getPaint().getTextSize(),
                 Color.parseColor("#FEE8C6"), Color.parseColor("#FFD5A3"), Shader.TileMode.CLAMP));
diff --git a/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml b/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
index c14015e31..4ef716799 100644
--- a/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
+++ b/common/src/main/res/layout/fragment_gift_wall_man_tab_1.xml
@@ -130,11 +130,11 @@
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/recyclerView1"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="0dp"
-                        android:layout_marginStart="45dp"
+                        android:layout_marginStart="30dp"
                         android:layout_marginTop="50dp"
-                        android:layout_marginEnd="45dp"
+                        android:layout_marginEnd="20dp"
                         android:layout_marginBottom="20dp"
                         android:orientation="vertical"
                         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
@@ -194,14 +194,14 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView2"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginStart="45dp"
-            android:layout_marginEnd="45dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="50dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="10dp"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            android:layout_marginTop="50dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml b/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
index e1854d0d8..4bec65ff9 100644
--- a/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
+++ b/common/src/main/res/layout/fragment_gift_wall_man_tab_2.xml
@@ -121,9 +121,11 @@
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/recyclerView1"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="match_parent"
+                            android:layout_marginStart="20dp"
                             android:layout_marginTop="50dp"
+                            android:layout_marginEnd="20dp"
                             android:orientation="vertical"
                             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -152,9 +154,11 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView2"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="50dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="20dp"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
diff --git a/common/src/main/res/layout/item_gift_wall_man_tab1_list_1.xml b/common/src/main/res/layout/item_gift_wall_man_tab1_list_1.xml
index 88d8fb768..77b7ab37e 100644
--- a/common/src/main/res/layout/item_gift_wall_man_tab1_list_1.xml
+++ b/common/src/main/res/layout/item_gift_wall_man_tab1_list_1.xml
@@ -2,18 +2,18 @@
 <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="90dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
     <com.opensource.svgaplayer.SVGAImageView
         android:id="@+id/gift_bg"
-        app:autoPlay="true"
         android:layout_width="90dp"
         android:layout_height="90dp"
+        android:src="@mipmap/gift_wall_main_item_bg1"
+        app:autoPlay="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:src="@mipmap/gift_wall_main_item_bg1" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/gift_soles"
@@ -28,13 +28,13 @@
     <TextView
         android:id="@+id/gift_status"
         android:layout_width="wrap_content"
-        android:textSize="10sp"
-        android:textColor="#01071A"
         android:layout_height="wrap_content"
-        tools:text="未點亮"
+        android:textColor="#01071A"
+        android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="@+id/gift_bg"
         app:layout_constraintEnd_toEndOf="@+id/gift_soles"
-        app:layout_constraintStart_toStartOf="@+id/gift_soles" />
+        app:layout_constraintStart_toStartOf="@+id/gift_soles"
+        tools:text="未點亮" />
 
     <ImageView
         android:id="@+id/gift"
@@ -50,9 +50,9 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="0dp"
         android:layout_height="2dp"
-        android:progressDrawable="@drawable/gift_wall_main_tab_list_item_progres"
         android:max="100"
         android:progress="40"
+        android:progressDrawable="@drawable/gift_wall_main_tab_list_item_progres"
         app:layout_constraintBottom_toBottomOf="@+id/gift_bg"
         app:layout_constraintEnd_toEndOf="@+id/gift_soles"
         app:layout_constraintStart_toStartOf="@+id/gift_soles" />
@@ -61,11 +61,11 @@
         android:id="@+id/gift_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="扬帆出海"
         android:textColor="#FFFFFF"
         android:textSize="11sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gift_soles" />
+        app:layout_constraintTop_toBottomOf="@+id/gift_soles"
+        tools:text="扬帆出海" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file