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 7a4b05e..c24dd73 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 @@ -5,6 +5,7 @@ import android.content.Intent import android.view.LayoutInflater import androidx.activity.viewModels import androidx.core.graphics.toColorInt +import androidx.core.view.isVisible import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle @@ -29,6 +30,7 @@ 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.widget.WithDrawItemView +import com.gamedog.vididin.manager.TaskManager import com.gamedog.vididin.manager.WithdrawManager import com.gamedog.vididin.manager.WithdrawManager.Companion.TRANSACTION_STATE_FAIL import com.gamedog.vididin.manager.WithdrawManager.Companion.TRANSACTION_STATE_ONGOING @@ -110,6 +112,10 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { } updateUICashTotal() + + if (TaskManager.instance().newbieFirstWithdrawStatus().getStatusBean().hasClaimReward) { + withdraw01.isVisible = false + } } diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt index c0c7137..c5416a9 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt @@ -327,10 +327,11 @@ class TasksFragment : AppViewsFragment(), OnTab private fun updateNewBieFirstWithdrawUI() { with(binding?.beginnerTaskWithdraw!!) { + val stateBean = TaskManager.instance().newbieFirstWithdrawStatus().getStatusBean() setActionFun { gotoWithDraw() } - val stateBean = TaskManager.instance().newbieFirstWithdrawStatus().getStatusBean() + setTaskStateInfo( stateBean.rewardGoldNum.toString(), if (stateBean.hasClaimReward) R.string.finished else R.string.go_and_do, 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 e3260c3..e3106ae 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -5,7 +5,6 @@ import com.ama.core.architecture.util.DateUtil import com.ama.core.architecture.util.DeviceUtil import com.ama.core.architecture.util.MD5Util import com.ama.core.architecture.util.NetUtil -import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.eventbus.NotifyMan import com.gamedog.vididin.VidiConst @@ -418,10 +417,18 @@ class WithdrawManager private constructor() { private fun handleTransactionSuccess(recordNo: String) { updateRecord(recordNo, TRANSACTION_STATE_SUCCESS) notifyWithdrawCheckResult(recordNo) - val recordBean = WithdrawManager.instance?.getRecord(recordNo) + val recordBean = getRecord(recordNo) recordBean?.let { RecordsManager.instance().updateCashRecord(RecordCash( RECORD_CASH_MINUS_WITHDRAW_SUCCESS, it.cashNum.toDouble(), true).apply { uuid = recordNo }) + + updateFirstWithdraw01Task(it) + } + } + + private fun updateFirstWithdraw01Task(recordBean: WithdrawRecord) { + if (recordBean.cashNum == 0.1F && !TaskManager.instance().newbieFirstWithdrawStatus().getStatusBean().hasClaimReward) { + TaskManager.instance().newbieFirstWithdrawStatus().claimReward() } }