From 2527c6369faf94c8c634eaccfa99c8b7cc58edc4 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Fri, 26 Dec 2025 17:49:39 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20-=20=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gamedog/vididin/VididinEvents.kt | 3 ++- .../features/benefit/widget/CounterDownTimerView.kt | 2 +- .../vididin/features/withdraw/WithDrawActivity.kt | 7 ++++++- .../withdraw/widget/WithDrawItemBankView.kt | 13 +++++++++++++ .../com/gamedog/vididin/login/AccountManager.kt | 6 +++--- .../vididin/manager/helpers/BoxTaskHelper.kt | 10 ++++++---- app/src/main/res/layout/withdraw_item_bank_view.xml | 1 + 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt index a76dc4e..7e16937 100644 --- a/app/src/main/java/com/gamedog/vididin/VididinEvents.kt +++ b/app/src/main/java/com/gamedog/vididin/VididinEvents.kt @@ -4,7 +4,7 @@ object VididinEvents { const val Event_Sign_State_Changed = 600 const val Event_Account_Gold_Changed = 601 const val Event_Account_Cash_Changed = 602 - const val Event_Account_Bank_Info_Changed = 603 + const val EVENT_BANK_INFO_CHANGED = 603 const val Event_Account_Diamond_Changed = 604 @@ -52,6 +52,7 @@ object VididinEvents { const val EVENT_WITHDRAW_SELECTED_SUB_ITEM_CHANGED = 501 const val EVENT_WITHDRAW_CHECK_RESULT_UPDATED = 502 const val EVENT_WITHDRAW_ITEM_LIST_CHANGED = 503 + const val EVENT_WITHDRAW_BANK_ACCOUNT_CHANGED = 504 // zero withdraw events diff --git a/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt b/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt index cb36196..919517b 100644 --- a/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt +++ b/app/src/main/java/com/gamedog/vididin/features/benefit/widget/CounterDownTimerView.kt @@ -30,7 +30,7 @@ class CounterDownTimerView @JvmOverloads constructor( private fun startTimer() { val startMs = TaskManager.instance().boxTaskStatus().getCurrentBoxStartTimeMs() - val totalMs = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() + val totalMs = TaskManager.instance().boxTaskStatus().getCurrentBoxTotalDurationMs() val restMs = startMs + totalMs - System.currentTimeMillis() diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt index c1f6601..7a4b05e 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt @@ -174,12 +174,17 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { VididinEvents.EVENT_WITHDRAW_ITEM_LIST_CHANGED -> { udpateItemListUI() } + + VididinEvents.EVENT_BANK_INFO_CHANGED -> { + withdrawPix2.updateBankAccountInfo() + } } }, VididinEvents.Event_Account_Cash_Changed, VididinEvents.EVENT_AD_WATCHED_FOR_WITHDRAW_SMALL, VididinEvents.EVENT_WITHDRAW_CHECK_RESULT_UPDATED, - VididinEvents.EVENT_WITHDRAW_ITEM_LIST_CHANGED) + VididinEvents.EVENT_WITHDRAW_ITEM_LIST_CHANGED, + VididinEvents.EVENT_BANK_INFO_CHANGED) readTransactionsAndShowResult() diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/widget/WithDrawItemBankView.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/widget/WithDrawItemBankView.kt index 71dde2f..baad0ab 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/widget/WithDrawItemBankView.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/widget/WithDrawItemBankView.kt @@ -5,6 +5,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout import com.ama.core.architecture.util.ResUtil +import com.gamedog.vididin.core.login.login.AccountManager import com.vididin.real.money.game.R import com.vididin.real.money.game.databinding.WithdrawItemBankViewBinding as ViewBinding @@ -23,6 +24,18 @@ class WithDrawItemBankView @JvmOverloads constructor( mBinding = ViewBinding.inflate(LayoutInflater.from(context), this, true) } + fun updateBankAccountInfo() { + if (AccountManager.isBankAccountExist()) { + AccountManager.getBankInfo()?.bankAccount?.let { + mBinding.tvBankAccount.text = it + } + } + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + updateBankAccountInfo() + } /** * For withdraw number in top area diff --git a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt index 2439b0d..a26d4bd 100644 --- a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt +++ b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt @@ -116,13 +116,13 @@ object AccountManager { fun saveBankAccount(bankAccount: String?) { if (bankAccount.isNullOrEmpty()) { - mAccount?.bankInfo = null + mAccount.bankInfo = null } else { - mAccount?.bankInfo = BankInfo(bankAccount=bankAccount) + mAccount.bankInfo = BankInfo(bankAccount=bankAccount) } saveAccountInfo() NotifyMan.instance().sendEvent( - VididinEvents.Event_Account_Bank_Info_Changed, NotifyMan.NotifyData(bankAccount)) + VididinEvents.EVENT_BANK_INFO_CHANGED, NotifyMan.NotifyData(bankAccount)) } diff --git a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt index 53edfa2..72c379b 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/helpers/BoxTaskHelper.kt @@ -7,10 +7,8 @@ import com.ama.core.architecture.util.eventbus.NotifyMan import com.vididin.real.money.game.R import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.beans.RECORD_CASH_PLUS_BOX_TASK -import com.gamedog.vididin.beans.RECORD_CASH_PLUS_GOLD_CONVERT import com.gamedog.vididin.beans.RecordCash import com.gamedog.vididin.core.login.login.AccountManager -import com.gamedog.vididin.core.login.login.AccountManager.adjustCash import com.gamedog.vididin.main.fragments.task.BoxTaskRoot import com.gamedog.vididin.manager.TaskManager import com.gamedog.vididin.manager.TaskManager.Companion.BOX_SUB_TASK_TYPE_ZERO_BUY @@ -170,7 +168,11 @@ class BoxTaskHelper: BaseTaskHelper() { return null } - fun getLeftValidBoxTotalDurationMs(): Long { + fun getCurrentBoxTotalDurationMs(): Long { + return 1L * mStateBean.boxList[mStateBean.currentBoxIndex].duration_days * 24 * 3600000 + } + + fun getLeftValidBoxTotalDurationMs2(): Long { var totalLeftMs = 0L val currentBoxIndex = mStateBean.currentBoxIndex mStateBean.boxList.forEachIndexed { index, box -> @@ -186,7 +188,7 @@ class BoxTaskHelper: BaseTaskHelper() { } fun getLeftValidBoxTotalDurationStr(): String { - val leftMs = TaskManager.instance().boxTaskStatus().getLeftValidBoxTotalDurationMs() + val leftMs = TaskManager.instance().boxTaskStatus().getCurrentBoxTotalDurationMs() val boxLeftDays = leftMs / (24*3600000) val boxLeftHours = (leftMs - boxLeftDays * 24 * 3600000) / 3600000 return boxLeftDays.toString() + ResUtil.getString(R.string.day_simple) + " " + boxLeftHours.toString( ) + ResUtil.getString(R.string.hour_simple) diff --git a/app/src/main/res/layout/withdraw_item_bank_view.xml b/app/src/main/res/layout/withdraw_item_bank_view.xml index 598363f..6ca7270 100644 --- a/app/src/main/res/layout/withdraw_item_bank_view.xml +++ b/app/src/main/res/layout/withdraw_item_bank_view.xml @@ -36,6 +36,7 @@ />