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 3c7b5fa..7ddb638 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 @@ -21,6 +21,7 @@ import com.gamedog.vididin.features.withdraw.dialogs.WithdrawInfoConfirmDialog import com.gamedog.vididin.features.withdraw.dialogs.WithdrawSuccessDialog import com.gamedog.vididin.features.withdraw.widget.WithDrawItemView import com.gamedog.vididin.manager.WithdrawManager +import com.gamedog.vididin.manager.WithdrawManager.Companion.FAIL_TYPE_APP_VERSION_LOW import com.gamedog.vididin.manager.WithdrawManager.Companion.TRANSACTION_STATE_FAIL import com.gamedog.vididin.manager.WithdrawManager.Companion.TRANSACTION_STATE_ONGOING import com.gamedog.vididin.manager.WithdrawManager.Companion.TRANSACTION_STATE_SUCCESS @@ -278,7 +279,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { } private fun showTransactionResultDialog(record: WithdrawRecord) { - if (record.hasShowResultDialog && record.state != TRANSACTION_STATE_ONGOING) { + if (!record.hasShowResultDialog && record.state != TRANSACTION_STATE_ONGOING) { when (record.state) { TRANSACTION_STATE_SUCCESS -> { showSuccessDialog(record.cashNum) @@ -286,7 +287,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { } TRANSACTION_STATE_FAIL -> { - showFailDialog(record.failReason) + showFailDialog(WithdrawManager.instance().getFailShowTextRes(record.failReason)) WithdrawManager.instance().saveRecordHasNotifyState(record.recordNo) } } 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 34daa31..a92f50a 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 @@ -266,7 +266,7 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity() { } private fun showTransactionResultDialog(record: WithdrawRecord) { - if (record.hasShowResultDialog && record.state != TRANSACTION_STATE_ONGOING) { + if (!record.hasShowResultDialog && record.state != TRANSACTION_STATE_ONGOING) { when (record.state) { TRANSACTION_STATE_SUCCESS -> { showSuccessDialog(record.cashNum) @@ -274,7 +274,7 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity() { } TRANSACTION_STATE_FAIL -> { - showFailDialog(record.failReason) + showFailDialog(WithdrawManager.instance().getFailShowTextRes(record.failReason)) WithdrawManager.instance().saveRecordHasNotifyState(record.recordNo) } } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawFailDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawFailDialog.kt index d67746e..edc8c06 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawFailDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawFailDialog.kt @@ -4,13 +4,11 @@ package com.gamedog.vididin.features.withdraw.dialogs import android.app.Activity import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog -import com.gamedog.vididin.manager.WithdrawManager.Companion.FAIL_TYPE_APP_VERSION_LOW import com.vididin.real.money.game.databinding.DialogWithdrawFailBinding as ViewBinding import com.gamedog.vididin.router.Router -import com.vididin.real.money.game.R -class WithdrawFailDialog(context: Activity, private val failType: Int) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawFailDialog(context: Activity, private val errorHintRes: Int) : BindingDialog(context, ViewBinding::inflate) { init { build() @@ -41,13 +39,7 @@ class WithdrawFailDialog(context: Activity, private val failType: Int) : Binding } } - var failTextRes = R.string.withdraw_normal_fail - when (failType) { - FAIL_TYPE_APP_VERSION_LOW -> { - failTextRes = R.string.withdraw_fail_version_toolow - } - } - tvReason.setText(failTextRes) + tvReason.setText(errorHintRes) } } 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 8c8675f..c5ed629 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -16,6 +16,7 @@ import com.gamedog.vididin.features.withdraw.WithDrawActivity.Companion.FINAL_ST import com.gamedog.vididin.manager.WithdrawManager.Companion.STATE_NEED_WATCH_AD import com.gamedog.vididin.netbase.NetworkUtil import com.gamedog.vididin.netbase.Result +import com.vididin.real.money.game.R import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -358,6 +359,15 @@ class WithdrawManager private constructor() { return dataBean } + fun getFailShowTextRes(failReason: Int): Int { + var failTextRes = R.string.withdraw_normal_fail + when (failReason) { + FAIL_TYPE_APP_VERSION_LOW -> { + failTextRes = R.string.withdraw_fail_version_toolow + } + } + return failTextRes + } }