From adfa6bca79cf77bdf474cb9c7186c6d37fcfd367 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Thu, 25 Dec 2025 11:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gamedog/vididin/beans/RecordCash.kt  | 10 ++++++++--
 .../features/withdrawrecord/RecordCashRvAdapter.kt     |  5 +++--
 .../features/withdrawrecord/RecordGoldRvAdapter.kt     |  2 --
 .../res/layout/fragment_withdraw_record_gold_item.xml  |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/beans/RecordCash.kt b/app/src/main/java/com/gamedog/vididin/beans/RecordCash.kt
index c7087b2..1ff1540 100644
--- a/app/src/main/java/com/gamedog/vididin/beans/RecordCash.kt
+++ b/app/src/main/java/com/gamedog/vididin/beans/RecordCash.kt
@@ -25,6 +25,7 @@ class RecordCashShow: RecordCash() {
     var title: Int = 0
     var description: Int = 0
     var iconRes: Int = 0
+    var textColor: Int = R.color.green_39
 }
 
 
@@ -41,30 +42,35 @@ fun RecordCash.toShowBean(): RecordCashShow {
                 title = R.string.record_cash_title_convert_from_gold
                 description = R.string.record_cash_descr_convert_from_gold
                 iconRes = R.mipmap.task_gold
+                textColor = R.color.green_39
             }
 
             RECORD_CASH_PLUS_BOX_TASK -> {
                 title = R.string.record_cash_title_box
                 description = R.string.record_cash_descr_box
                 iconRes = R.mipmap.icon_gift
+                textColor = R.color.green_39
             }
 
             RECORD_CASH_PLUS_WITHDRAW_ONGOING -> {
                 title = R.string.record_cash_title_withdraw_ongoing
                 description = R.string.record_cash_descr_withdraw_onging
-                iconRes = R.mipmap.icon_fail
+                iconRes = R.mipmap.icon_convert_cash
+                textColor = R.color.red_28
             }
 
             RECORD_CASH_PLUS_WITHDRAW_FAIL -> {
                 title = R.string.record_cash_title_withdraw_failed
                 description = R.string.record_cash_descr_withdraw_failed_3
-                iconRes = R.mipmap.icon_ad
+                iconRes = R.mipmap.icon_fail
+                textColor = R.color.gray3
             }
 
             RECORD_CASH_MINUS_WITHDRAW_SUCCESS -> {
                 title = R.string.record_cash_title_withdraw_success
                 description = R.string.record_cash_descr_withdraw_success
                 iconRes = R.mipmap.icon_check
+                textColor = R.color.green_39
             }
 
         }
diff --git a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordCashRvAdapter.kt b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordCashRvAdapter.kt
index 8bfa2d3..e87cece 100644
--- a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordCashRvAdapter.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordCashRvAdapter.kt
@@ -28,9 +28,10 @@ class RecordCashRvAdapter : ListAdapter<RecordCashShow, RecordCashRvAdapter.View
             binding.tvDate.text = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(data.dateMs)
             binding.tvTitle.text = ResUtil.getString(data.title)
             binding.tvDescription.text = ResUtil.getString(data.description)
-            binding.tvAmount.text = (if (data.amountNum < 0) "-" else "") + ResUtil.getString(R.string.cash) + " " + String.format("%.2f", Math.abs(data.amountNum))
             binding.ivType.setImageResource(data.iconRes)
-            binding.tvAmount.setTextColor(ResUtil.getColor(if (data.isSuccess) R.color.md_theme_error else R.color.green_39))
+
+            binding.tvAmount.text = (if (data.amountNum < 0) "-" else "") + ResUtil.getString(R.string.cash) + " " + String.format("%.2f", Math.abs(data.amountNum))
+            binding.tvAmount.setTextColor(ResUtil.getColor(data.textColor))
         }
     }
 
diff --git a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordGoldRvAdapter.kt b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordGoldRvAdapter.kt
index ad25adc..664a17b 100644
--- a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordGoldRvAdapter.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/RecordGoldRvAdapter.kt
@@ -7,7 +7,6 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.ama.core.architecture.util.ResUtil
 import com.gamedog.vididin.beans.RecordGoldShow
-import com.vididin.real.money.game.R
 import java.text.SimpleDateFormat
 import com.vididin.real.money.game.databinding.FragmentWithdrawRecordGoldItemBinding as ViewBinding
 
@@ -29,7 +28,6 @@ class RecordGoldRvAdapter : ListAdapter<RecordGoldShow, RecordGoldRvAdapter.View
             binding.tvDescription.text = ResUtil.getString(data.description)
             binding.tvAmount.text = data.amountNum.toString()
             binding.ivType.setImageResource(data.iconRes)
-            binding.tvAmount.setTextColor(ResUtil.getColor(if (data.isSuccess) R.color.md_theme_error else R.color.green_39))
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_withdraw_record_gold_item.xml b/app/src/main/res/layout/fragment_withdraw_record_gold_item.xml
index 49e3bd7..f46ed1c 100644
--- a/app/src/main/res/layout/fragment_withdraw_record_gold_item.xml
+++ b/app/src/main/res/layout/fragment_withdraw_record_gold_item.xml
@@ -54,6 +54,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
+                    android:drawableStart="@mipmap/task_gold"
                     android:text="-R$ 0,1"
                     android:textSize="15sp"
                     android:textStyle="bold"