From 8ad993bb6b64b61c5545ebc2f4f4c3ef820d04e3 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Thu, 6 Jun 2024 15:41:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DUI=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chwl/app/ui/gift/dialog/GiftInfoVm.java   |  2 +-
 .../main/res/layout/list_item_dialog_gift.xml | 34 +++++++++++++------
 .../res/layout/wallet_diamond_fragment.xml    |  4 +--
 app/src/main/res/values-ar/strings.xml        |  2 +-
 .../res/drawable/game_bg_award.xml            |  2 +-
 .../module_game/res/layout/game_activity.xml  |  6 ++--
 6 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java
index 07116809d..36f0bb426 100644
--- a/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java
+++ b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java
@@ -77,7 +77,7 @@ public class GiftInfoVm extends BaseItem<GiftInfo> {
         if (data.getConsumeType() == GiftInfo.CONSUME_TYPE_GOLD) {
             radishDrawable = null;
             radishDrawableSelected = null;
-            goldText.set(context.getResources().getString(R.string.how_much_gold, data.getGoldPrice()));
+            goldText.set(String.valueOf(data.getGoldPrice()));
         } else if (data.getConsumeType() == GiftInfo.CONSUME_TYPE_FREE_GIFT) {
             radishDrawable = null;
             radishDrawableSelected = null;
diff --git a/app/src/main/res/layout/list_item_dialog_gift.xml b/app/src/main/res/layout/list_item_dialog_gift.xml
index 751be7fc4..c9c71ee44 100644
--- a/app/src/main/res/layout/list_item_dialog_gift.xml
+++ b/app/src/main/res/layout/list_item_dialog_gift.xml
@@ -66,19 +66,33 @@
             tools:ignore="SpUsage"
             tools:text="123" />
 
-        <TextView
-            android:id="@+id/gift_gold"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/layout_money"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/gift_name"
             android:layout_centerHorizontal="true"
-            android:drawableStart="@{item.isSelect?item.radishDrawableSelected:item.radishDrawable}"
-            android:drawablePadding="2dp"
-            android:text="@{item.goldText}"
-            android:textColor="@{item.isSelect ? @color/color_ffb606_transparent_65 : @color/white_transparent_50}"
-            android:textSize="@dimen/dp_10"
-            tools:ignore="SpUsage"
-            tools:text="123" />
+            android:layout_marginTop="3dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/gift_gold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{item.goldText}"
+                android:textColor="@{item.isSelect ? @color/color_ffb606_transparent_65 : @color/white_transparent_50}"
+                android:textSize="@dimen/dp_10"
+                tools:ignore="SpUsage"
+                tools:text="123" />
+
+            <ImageView
+                android:layout_width="@dimen/dp_12"
+                android:layout_height="@dimen/dp_12"
+                android:layout_marginStart="@dimen/dp_2"
+                android:src="@drawable/ic_gift_diamond"
+                android:visibility="@{item.isFreeGift ? View.GONE : View.VISIBLE}" />
+        </LinearLayout>
 
         <TextView
             android:id="@+id/tv_free_count_down"
diff --git a/app/src/main/res/layout/wallet_diamond_fragment.xml b/app/src/main/res/layout/wallet_diamond_fragment.xml
index 9414c41fa..fde84b422 100644
--- a/app/src/main/res/layout/wallet_diamond_fragment.xml
+++ b/app/src/main/res/layout/wallet_diamond_fragment.xml
@@ -83,14 +83,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/dp_3"
                 android:text="@string/detail"
-                android:textColor="#B38C3F"
+                android:textColor="#737D83"
                 android:textSize="@dimen/dp_12" />
 
             <com.chwl.app.view.AutoMirroredImageView
                 android:id="@+id/iv_details_arrow"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/wallet_ic_coins_details_arrow" />
+                android:src="@drawable/wallet_ic_diamond_details_arrow" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 41811fd67..e18393a65 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -955,7 +955,7 @@
     <string name="me_gain_recording">سجل الإيرادات</string>
     <string name="me_clean_diamond">تحويل الكوينزات</string>
     <string name="me_give_gift">إرسال الهدايا</string>
-    <string name="me_donation">تحويلاتي</string>
+    <string name="me_donation">وكالة شحن</string>
     <string name="donation_to">تحويل إلي</string>
     <string name="me_donation_detail">تفاصيل التحويلات</string>
 
diff --git a/app/src/module_game/res/drawable/game_bg_award.xml b/app/src/module_game/res/drawable/game_bg_award.xml
index 1d33fbcea..6ea89fdb3 100644
--- a/app/src/module_game/res/drawable/game_bg_award.xml
+++ b/app/src/module_game/res/drawable/game_bg_award.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <corners android:radius="@dimen/dp_25" />
-    <solid android:color="#66FFFFFF" />
+    <solid android:color="#66006263" />
     <stroke
         android:width="@dimen/dp_0_5"
         android:color="#36C0C8" />
diff --git a/app/src/module_game/res/layout/game_activity.xml b/app/src/module_game/res/layout/game_activity.xml
index 47c0ad01a..6ab58e600 100644
--- a/app/src/module_game/res/layout/game_activity.xml
+++ b/app/src/module_game/res/layout/game_activity.xml
@@ -95,13 +95,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_25"
                 android:layout_gravity="start"
-                android:layout_marginStart="@dimen/dp_23"
+                android:layout_marginStart="@dimen/dp_21"
                 android:gravity="center|center_vertical"
+                android:includeFontPadding="false"
                 android:minWidth="@dimen/dp_56"
                 android:paddingStart="@dimen/dp_10"
                 android:paddingEnd="@dimen/dp_10"
                 android:textColor="@color/white"
-                android:textSize="@dimen/dp_17" />
+                android:textSize="@dimen/dp_17"
+                tools:text="0" />
         </FrameLayout>
 
         <ImageView