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 8744c5e..fa6952d 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 @@ -25,10 +25,12 @@ import com.gamedog.vididin.features.withdraw.dialogs.WithdrawBindBankDialog import com.gamedog.vididin.features.withdraw.dialogs.WithdrawFailDialog import com.gamedog.vididin.features.withdraw.dialogs.WithdrawInfoConfirmDialog import com.gamedog.vididin.features.withdraw.dialogs.WithdrawSuccessDialog +import com.gamedog.vididin.features.withdraw.dialogs.WithdrawWatchAdDialog import com.gamedog.vididin.features.withdraw.widget.WithDrawItemView import com.gamedog.vididin.manager.GuideManager import com.gamedog.vididin.manager.TaskManager import com.gamedog.vididin.manager.WithdrawManager +import com.gamedog.vididin.manager.WithdrawManager.Companion.STATE_COULD_WITHDRAW import com.gamedog.vididin.manager.WithdrawManager.Companion.STATE_WITHDRAW_SUCCESS import com.gamedog.vididin.manager.WithdrawManager.Companion.TRANSACTION_STATE_FAIL import com.gamedog.vididin.manager.WithdrawManager.Companion.TRANSACTION_STATE_ONGOING @@ -132,7 +134,11 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { if (!hasBindBank) { WithdrawBindBankDialog(this@WithDrawActivity, ::startRealWithdraw ).setWithDrawCashNum(cashNum).show() } else { - WithdrawInfoConfirmDialog(this@WithDrawActivity, ::startRealWithdraw).setWithDrawCashNum(cashNum).show() + if (WithdrawManager.instance().getItemState(0, 0) == STATE_COULD_WITHDRAW) { + WithdrawInfoConfirmDialog(this@WithDrawActivity, ::startRealWithdraw).setWithDrawCashNum(cashNum).show() + } else { + WithdrawWatchAdDialog(this@WithDrawActivity, cashNum, ::startRealWithdraw).show() + } } } @@ -175,8 +181,8 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { } VididinEvents.EVENT_AD_WATCHED_FOR_WITHDRAW_SMALL -> { - /*val notifyData: WatchAdNotifyBean = data.mData as WatchAdNotifyBean - requestInit(notifyData.extraData)*/ + WithdrawManager.instance().saveSmallWithdrawHasWatchedAd() + handleGotoWithdraw(0) } VididinEvents.EVENT_WITHDRAW_RESULT_UPDATED -> { diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawWatchAdDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawWatchAdDialog.kt index dd510c2..81ca9db 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawWatchAdDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/dialogs/WithdrawWatchAdDialog.kt @@ -3,7 +3,6 @@ package com.gamedog.vididin.features.withdraw.dialogs import android.app.Activity import com.ama.core.architecture.util.AndroidUtil -import com.ama.core.architecture.util.eventbus.NotifyMan import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.VidiConst @@ -12,7 +11,7 @@ import com.viddin.videos.free.R import com.viddin.videos.free.databinding.DialogWithdrawWatchAdBinding as ViewBinding -class WithdrawWatchAdDialog(context: Activity, private var mWithdrawCashNum: Float) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawWatchAdDialog(context: Activity, private var mWithdrawCashNum: Double, private val onConfirmed: (cashNum: Double)->Unit) : BindingDialog(context, ViewBinding::inflate) { init { @@ -28,7 +27,7 @@ class WithdrawWatchAdDialog(context: Activity, private var mWithdrawCashNum: Flo mBinding.run { progressBar.setBarColor(R.color.blue_ba, R.color.blue_ff) - tvCashNum.text = mWithdrawCashNum.toString() + setOnClickBatch(flAction, ivClose) { when (this) { 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 c0942bd..e52153d 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -21,6 +21,7 @@ import com.gamedog.vididin.core.login.login.AccountManager 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.mbridge.msdk.thrid.okhttp.internal.http2.c import com.viddin.videos.free.R import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -720,6 +721,18 @@ class WithdrawManager private constructor() { } } + fun saveSmallWithdrawHasWatchedAd() { + getItem(0).hasStarted = true + if (getItem(0).subItemList.size > 0) { + getItem(0).subItemList[0].apply { + withdrawState = STATE_COULD_WITHDRAW + currentAdProgress = 100F + hasEarnMoneyByAd = 0.1 + } + } + saveInfos2Sp(mWithdrawItemList) + } + } diff --git a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml index 938ff68..c838ae7 100644 --- a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml +++ b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml @@ -82,18 +82,10 @@ android:layout_height="wrap_content" android:textSize="30sp" android:textColor="@color/green_2c" - android:text="@string/cash" + android:textStyle="bold" + android:text="@string/cash01" android:drawableStart="@mipmap/icon_cash" /> - -