From 4f624189c87a7c114945cd1dbef117043ac54cc6 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Mon, 19 Jan 2026 16:10:37 +0800
Subject: [PATCH] =?UTF-8?q?SubWithdraw=20=E6=8F=90=E7=8E=B0=E4=B8=AD=20pen?=
 =?UTF-8?q?ding=20=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vididin/features/watchad/WatchAdActivity.kt       |  2 +-
 .../vididin/features/withdraw/WithDrawSubActivity.kt  | 11 ++++++++---
 .../com/gamedog/vididin/manager/WithdrawManager.kt    |  9 ++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt
index 60fb687..d6ddd4a 100644
--- a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt
@@ -192,7 +192,7 @@ class WatchAdActivity : AppViewsEmptyViewModelActivity<ViewBinding>(), OnTabStyl
                     if (!mIsLoadSuccess) {
                         handleLoadFailed()
                     }
-                }, 30000)
+                }, 3000)
 
 
                 try {
diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawSubActivity.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawSubActivity.kt
index dd1d00b..88cd26c 100644
--- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawSubActivity.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawSubActivity.kt
@@ -145,6 +145,10 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity<ViewBinding>() {
                     updateUI()
                 }
 
+                VididinEvents.EVENT_WITHDRAW_ITEM_LIST_CHANGED -> {
+                    updateUI()
+                }
+
                 VididinEvents.EVENT_WITHDRAW_RESULT_UPDATED -> {
                     try {
                         val record = data.mData as RecordCash
@@ -159,7 +163,8 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity<ViewBinding>() {
         }, VididinEvents.EVENT_AD_WATCHED_FOR_WITHDRAW_BIG,
             VididinEvents.EVENT_WITHDRAW_SUB_ITEM_PROGRESS_UPDATED,
             VididinEvents.EVENT_WITHDRAW_SELECTED_SUB_ITEM_CHANGED,
-            VididinEvents.EVENT_WITHDRAW_RESULT_UPDATED )
+            VididinEvents.EVENT_WITHDRAW_RESULT_UPDATED,
+            VididinEvents.EVENT_WITHDRAW_ITEM_LIST_CHANGED)
 
 
         mCurItem = WithdrawManager.instance().getItem(mType)
@@ -224,7 +229,7 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity<ViewBinding>() {
             } else {
                 var actionText = R.string.withdraw_cash_out
                 when(subBean.withdrawState) {
-                    WithdrawManager.STATE_COULD_WITHDRAW -> {
+                     WithdrawManager.STATE_COULD_WITHDRAW -> {
                         actionText = R.string.withdraw_cash_out
                         flAction.isClickable = true
                         flAction.alpha = 1F
@@ -236,7 +241,7 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity<ViewBinding>() {
                         flAction.alpha = 0.6F
                     }
 
-                    WithdrawManager.STATE_HAS_WITHDRAWED -> {
+                    WithdrawManager.STATE_WITHDRAW_SUCCESS -> {
                         actionText = R.string.withdraw_success
                         flAction.isClickable = false
                         flAction.alpha = 0.6F
diff --git a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt
index f11b9b3..706b241 100644
--- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt
+++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt
@@ -86,8 +86,7 @@ class WithdrawManager private constructor() {
         const val STATE_NEED_WATCH_AD: Int = 0
         const val STATE_COULD_WITHDRAW: Int = 1
         const val STATE_WITHDRAWING: Int = 2
-        const val STATE_HAS_WITHDRAWED: Int = 3
-        const val STATE_WITHDRAW_SUCCESS: Int = 4
+        const val STATE_WITHDRAW_SUCCESS: Int = 3
 
         //  提现交易状态  提现状态 0: 未启动 1:提现中,2:提现成功,3:提现失败
         const val TRANSACTION_STATE_UNSTART : Int = 0
@@ -235,7 +234,7 @@ class WithdrawManager private constructor() {
         } else {
             var allSubItemFinish = true
             mWithdrawItemList[itemIndex].subItemList.forEach {
-                if (it.withdrawState != STATE_HAS_WITHDRAWED) {
+                if (it.withdrawState != STATE_WITHDRAW_SUCCESS) {
                     allSubItemFinish = false
                     return@forEach
                 }
@@ -675,7 +674,7 @@ class WithdrawManager private constructor() {
             withdrawRecord.hasShowResultDialog = false
 
             RecordsManager.instance().updateCashRecord(withdrawRecord)
-            updateItemState(withdrawRecord.withdrawItemIndex, withdrawRecord.withdrawItemSubIndex, STATE_WITHDRAW_SUCCESS)
+            updateItemState(withdrawRecord.withdrawItemIndex, withdrawRecord.withdrawItemSubIndex, STATE_COULD_WITHDRAW)
 
             // 2. 事件通知以便更新UI
             notifyWithdrawResult(withdrawRecord)
@@ -697,7 +696,7 @@ class WithdrawManager private constructor() {
         // 1. 更新record 并保存
         withdrawRecord.withdrawState = TRANSACTION_STATE_SUCCESS
         RecordsManager.instance().updateCashRecord(withdrawRecord)
-        updateItemState(withdrawRecord.withdrawItemIndex, withdrawRecord.withdrawItemSubIndex, STATE_HAS_WITHDRAWED)
+        updateItemState(withdrawRecord.withdrawItemIndex, withdrawRecord.withdrawItemSubIndex, STATE_WITHDRAW_SUCCESS)
 
         // 2. 更新取现 条目状态
         if (withdrawRecord.withdrawItemIndex >= 0) {