From 7fc1c2e712deb55867e683ff50a8d99a140fc445 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 16 Jul 2024 17:24:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A4=BC=E7=89=A9=E5=A2=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/build.gradle                                        | 2 +-
 .../com/yunbao/common/dialog/GiftWallGiftInfoDialog.java   | 2 +-
 common/src/main/res/layout/dialog_gift_wall_gift_info.xml  | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index 664aa81d8..bc2719d4f 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -229,7 +229,7 @@ dependencies {
     //文字渐变色
     api 'com.github.FlyJingFish:GradientTextView:1.2.4'
     //轮播  一屏显示多个
-    api 'com.github.xiaohaibin:XBanner:androidx_v1.2.6'
+    api 'com.github.xiaohaibin:XBanner:androidx_v1.2.8'
     //声网SDK
     //api 'io.agora.rtc:agora-special-full:4.2.6.245'
 
diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
index b5966247b..b81e24e52 100644
--- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
@@ -336,7 +336,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
 
         String tmp = "";
         if (giftBean.getGift_info().getIlluminate_status() == 0) {//未點亮
-            btn_one.setText(WordUtil.getNewString(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_light));
+            btn_one.setText(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_light);
             tmp = String.format(Locale.getDefault(), "%s", (giftBean.getGift_info().getIlluminate_num() - Integer.parseInt(giftBean.getGift_info().getGift_hall_send_num())));
             setTips(tmp);
         } else {//冠名/摘星
diff --git a/common/src/main/res/layout/dialog_gift_wall_gift_info.xml b/common/src/main/res/layout/dialog_gift_wall_gift_info.xml
index 3b17a135c..05e1dd297 100644
--- a/common/src/main/res/layout/dialog_gift_wall_gift_info.xml
+++ b/common/src/main/res/layout/dialog_gift_wall_gift_info.xml
@@ -222,7 +222,6 @@
                         android:layout_marginEnd="50dp"
                         android:background="@drawable/gift_wall_gift_info_list_btn_down"
                         android:gravity="center"
-                        android:minWidth="70dp"
                         android:text="@string/dialog_gift_wall_gfit_info_list_title_assistance"
                         android:textAllCaps="false"
                         android:textColor="#FFF"
@@ -230,7 +229,7 @@
 
                     <Button
                         android:id="@+id/tab2"
-                        android:layout_width="70dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="30dp"
                         android:background="@drawable/gift_wall_gift_info_list_btn_up"
                         android:gravity="center"
@@ -352,8 +351,9 @@
             android:layout_marginEnd="17dp"
             android:background="@drawable/gift_wall_gift_info_btn"
             android:gravity="center"
-            android:minWidth="65dp"
             android:textAllCaps="false"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
             android:textColor="#02215D"
             android:textSize="11.5sp"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -366,6 +366,7 @@
             android:layout_width="wrap_content"
             android:layout_height="11dp"
             android:layout_marginBottom="-5dp"
+            android:textAllCaps="false"
             android:background="@drawable/gift_wall_gift_info_bottom_btn_tips"
             android:elevation="10dp"
             android:minWidth="32dp"