From ba220384cb84618ac7bb3531953e43b768a05be5 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Tue, 6 Jan 2026 17:56:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=A7=E5=93=81=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E6=8F=90=E7=8E=B0=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=9A?= =?UTF-8?q?=E4=B8=80=E6=97=A6=E8=BF=9B=E5=85=A5100%=20=E6=9D=A1=E7=9B=AE?= =?UTF-8?q?=EF=BC=8C=E9=A9=AC=E4=B8=8A=E6=89=A3=E5=87=8F=E7=8E=B0=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/withdraw/WithDrawActivity.kt | 2 +- .../dialogs/WithdrawInfoConfirmDialog.kt | 8 +----- .../gamedog/vididin/login/AccountManager.kt | 2 +- .../vididin/manager/WithdrawManager.kt | 25 +++++-------------- 4 files changed, 9 insertions(+), 28 deletions(-) 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 9815e45..65023e7 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 @@ -123,6 +123,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { private fun handleGotoWithdraw(itemIndex: Int) { val cashNum = mItemViewList.get(itemIndex).getCashNum() if (cashNum > 1.0) { + WithdrawManager.instance().setItemStarted(itemIndex) gotoWithdrawSubActivity(itemIndex) } else { val hasBindBank = AccountManager.hasValidBankInfo() @@ -316,7 +317,6 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { private fun gotoWithdrawSubActivity(selectedIndex: Int) { Router.WithdrawSub.startActivity(this, selectedIndex) - WithdrawManager.instance().setItemStarted(selectedIndex) } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt index 54495ad..62e4bf3 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawInfoConfirmDialog.kt @@ -46,13 +46,7 @@ class WithdrawInfoConfirmDialog(context: Activity, private val onConfirmed: (cas } tvActionApply -> { - if (AccountManager.getCash() < mWithdrawCashNum) { - AndroidUtil.showToast(R.string.not_enough_cash) - } else { - //WithdrawWatchAdDialog(mActivity, mWithdrawCashNum).show() - onConfirmed.invoke(mWithdrawCashNum) - } - + onConfirmed.invoke(mWithdrawCashNum) StatisticUtil.reportEvents(StatisticUtil.KEY_Withdrawal_Apply, mapOf("Withdrawal_Position" to mWithdrawCashNum, "Withdrawal_Day" to 1)) 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 ceaff79..c336ab2 100644 --- a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt +++ b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt @@ -81,7 +81,7 @@ object AccountManager { } @Synchronized - fun adjustCash(adjustNum: Double, recordBean: RecordCash?): Boolean { + fun adjustCash(adjustNum: Double, recordBean: RecordCash? = null): Boolean { if (adjustNum < 0L && Math.abs(adjustNum) > getCash()) { return false } 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 5688156..3b6f6d8 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -248,10 +248,6 @@ class WithdrawManager private constructor() { mRecordLocker.unlock() } saveRecords2Sp() - val cashNum = newRecord.cashNum * -1 - AccountManager.adjustCash(cashNum, RecordCash( - RECORD_CASH_PLUS_WITHDRAW_ONGOING, cashNum.toDouble(), true).apply { uuid = newRecord.recordNo } - ) loopCheckTransactionState() } @@ -469,9 +465,6 @@ class WithdrawManager private constructor() { updateRecord(recordNo, TRANSACTION_STATE_FAIL, failedType) val recordBean = WithdrawManager.instance?.getRecord(recordNo) recordBean?.let { - AccountManager.adjustCash(it.cashNum, - RecordCash(RECORD_CASH_PLUS_WITHDRAW_FAIL, it.cashNum.toDouble(), false, failedType).apply { uuid = recordNo }) - sendWithdrawResultStatistic(it.cashNum, false, failedType) } notifyWithdrawCheckResult(recordNo) @@ -592,7 +585,7 @@ class WithdrawManager private constructor() { return 0.0 } - private fun getStartedItemRestCashCount(): Double { + /*private fun getStartedItemRestCashCount(): Double { var allStartedItemRestCashNum = 0.0 mItemList.forEachIndexed { index, item -> if (!(TaskManager.instance().newbieFirstWithdrawStatus().getStatusBean().hasClaimReward && index == 0)) { @@ -601,7 +594,7 @@ class WithdrawManager private constructor() { } return allStartedItemRestCashNum - } + }*/ fun getItemProgress(itemIndex: Int): Double { @@ -610,16 +603,10 @@ class WithdrawManager private constructor() { if (itemIndex in 0..mItemList.size-1) { val curItem = mItemList[itemIndex] val userCashTotal = AccountManager.getCash() - var restAvailableCashNum = userCashTotal - getStartedItemRestCashCount() - - if (restAvailableCashNum < 0.0) { - restAvailableCashNum = 0.0 - } - - if (curItem.hasStarted || restAvailableCashNum >= curItem.totalCashNum) { - itemProgress = 1.0 + if (curItem.hasStarted) { + return 1.0 } else { - itemProgress = restAvailableCashNum / curItem.totalCashNum + itemProgress = userCashTotal / curItem.totalCashNum } } @@ -632,7 +619,7 @@ class WithdrawManager private constructor() { if (!curItem.hasStarted) { curItem.hasStarted = true curItem.startMs = System.currentTimeMillis() - + AccountManager.adjustCash(-1 * curItem.totalCashNum) saveInfos2Sp(mItemList) notifyItemListChanged() }