From 7e35cc8e3c89717155059cf8307b0da9c879f3a0 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 11 Oct 2022 16:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A4=BC=E7=89=A9UI=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 live/src/main/res/layout/dialog_live_gift_wrap.xml | 13 +++++++++----
 live/src/main/res/layout/item_live_gift.xml        | 13 ++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/live/src/main/res/layout/dialog_live_gift_wrap.xml b/live/src/main/res/layout/dialog_live_gift_wrap.xml
index 6f3e5759c..a1efa2759 100644
--- a/live/src/main/res/layout/dialog_live_gift_wrap.xml
+++ b/live/src/main/res/layout/dialog_live_gift_wrap.xml
@@ -87,7 +87,8 @@
             android:id="@+id/gift_tab_layout"
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:gravity="center"
+            android:layout_height="50dp">
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/items"
                 android:layout_weight="1"
@@ -119,21 +120,24 @@
         <LinearLayout
             android:id="@+id/group"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="350dp"
+            android:gravity="bottom"
             android:layout_below="@id/gift_tab_layout"
             android:orientation="vertical">
 
-            <com.yunbao.live.custom.GiftPageViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_weight="1"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="8dp"/>
 
-            <com.yunbao.live.custom.GiftPageViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/vpWrapList"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_weight="1"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="8dp"
                 android:visibility="gone" />
@@ -157,6 +161,7 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="66dp"
+                android:layout_weight="0"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp">
 
diff --git a/live/src/main/res/layout/item_live_gift.xml b/live/src/main/res/layout/item_live_gift.xml
index 741e89bb1..3a51e2f13 100644
--- a/live/src/main/res/layout/item_live_gift.xml
+++ b/live/src/main/res/layout/item_live_gift.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    app:mfl_ratio="1.3"
     android:background="@drawable/bg_live_gift_items"
     >
 
@@ -27,7 +28,7 @@
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="8dp">
+        android:layout_marginTop="28dp">
 
         <ImageView
             android:id="@+id/icon"
@@ -98,19 +99,21 @@
         android:paddingRight="3dp"
         android:textColor="@color/white"
         android:textSize="10sp" />
+
     <LinearLayout
         android:id="@+id/gift_loading_layout"
-        android:background="#C0000000"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#C0000000"
         android:gravity="center"
-        android:layout_height="match_parent">
+        android:visibility="visible">
+
         <ImageView
             android:id="@+id/gift_loading"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="30dp"
-            android:src="@mipmap/icon_download_gift"
-            />
+            android:src="@mipmap/icon_download_gift" />
     </LinearLayout>