diff --git a/app/src/main/java/com/gamedog/vididin/beans/req/WithdrawInitReq.kt b/app/src/main/java/com/gamedog/vididin/beans/req/WithdrawInitReq.kt index c892e36..302a2f4 100644 --- a/app/src/main/java/com/gamedog/vididin/beans/req/WithdrawInitReq.kt +++ b/app/src/main/java/com/gamedog/vididin/beans/req/WithdrawInitReq.kt @@ -28,4 +28,4 @@ data class PayoutReq( var dataShuShu: PbReportDataShuShu = PbReportDataShuShu(), ) : PayInitReq() -data class PayoutCheckReq(var record_no: String? = null) : PayInitReq() \ No newline at end of file +data class PayoutCheckReq(var record_no: String = "") : PayInitReq() \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/beans/resp/WithDrawRespData.kt b/app/src/main/java/com/gamedog/vididin/beans/resp/WithDrawRespData.kt index a3eae75..2b364da 100644 --- a/app/src/main/java/com/gamedog/vididin/beans/resp/WithDrawRespData.kt +++ b/app/src/main/java/com/gamedog/vididin/beans/resp/WithDrawRespData.kt @@ -86,6 +86,6 @@ data class PayoutReply ( data class PayoutCheckData(var data: PayoutCheck? = null) : BaseReply() data class PayoutCheck( - var status: Int = 0, - var error: Int = 0, + var status: Int = 0, // 提现状态 1:提现中,2:提现成功,3:提现失败 + var error: Int = 0, // 错误码,0成功,1失败,2签名验证失败,3客户端版本过低,4 ts长度错误 ) \ No newline at end of file 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 503ad09..7f1829b 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 @@ -18,6 +18,7 @@ import com.gamedog.vididin.beans.resp.PayoutReply import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.features.withdraw.dialogs.WithdrawBindBankDialog 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.main.interfaces.OnTabStyleListener import com.gamedog.vididin.netbase.Result @@ -154,9 +155,8 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity(), OnTabSty } private fun tryWithdraw(withdrawNum: Float) { - withdrawInit(withdrawNum) - /*withdrawPayout() - withdrawCheck()*/ + // withdrawInit(withdrawNum) + withdrawCheck("PGS53c1b0079fad5bf5dc71d4d6b5dfc22e") } private fun withdrawInit(withdrawNum: Float) { @@ -244,7 +244,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity(), OnTabSty viewModel.withdrawPayout(initUUID, payItemId, payCashNum) } - private fun withdrawCheck() { + private fun withdrawCheck(recordNo: String) { lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { viewModel.CheckResult.collect { result -> @@ -253,7 +253,37 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity(), OnTabSty } is Result.Success -> { + val checkResult = result.data?.data + var errHintRes = 0 + when (checkResult?.error) { + 0 -> { + when (checkResult.status) { + // 提现状态 1:提现中,2:提现成功,3:提现失败 + 1 -> { + // try again + } + 2 -> { + showSuccessDialog() + } + 3 -> { + errHintRes = R.string.withdraw_normal_fail + } + } + } + + 1 -> { + errHintRes = R.string.withdraw_normal_fail + } + + 2 -> { + errHintRes = R.string.withdraw_fail_version_toolow + } + } + + if (errHintRes > 0) { + AndroidUtil.showToast(errHintRes) + } } is Result.Error -> { } @@ -262,7 +292,11 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity(), OnTabSty } } - viewModel.withdrawCheck() + viewModel.withdrawCheck(recordNo) + } + + private fun showSuccessDialog() { + WithdrawSuccessDialog(this).show() } private fun saveTransactionData(data: PayoutReply) { @@ -286,7 +320,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity(), OnTabSty } private fun startTimerForCheckPayoutResult(data: PayoutReply) { - withdrawCheck() + withdrawCheck(data.record_no!!) } companion object { diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawViewModel.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawViewModel.kt index 246325b..33de979 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawViewModel.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawViewModel.kt @@ -93,10 +93,10 @@ class WithdrawViewModel : ViewModel() { } } - fun withdrawCheck() { + fun withdrawCheck(recordNo: String) { viewModelScope.launch { val requestParam = PayoutCheckReq().applyInitFields().apply { - // TODO - + record_no = recordNo } _CheckResult.value = Result.Loading diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b9316a6..224a237 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -134,5 +134,6 @@ Your account withdraw status is unavailable. Regision restriction Amount limit + 0utros Erro \ No newline at end of file