From 9066b775a8379f2842d9302b6a3ae6cd0f2e8bf5 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Fri, 12 Dec 2025 17:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=A0=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gamedog/vididin/VidiConst.kt | 13 +++++++------ .../features/watchad/WatchAdActivity.kt | 2 +- .../features/withdraw/WithDrawSubActivity.kt | 18 ++++++++++-------- .../withdraw/dialogs/WithdrawWatchAdDialog.kt | 3 +-- .../gamedog/vididin/manager/WithdrawManager.kt | 5 ++--- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/gamedog/vididin/VidiConst.kt b/app/src/main/java/com/gamedog/vididin/VidiConst.kt index fe0abb8..7e3709c 100644 --- a/app/src/main/java/com/gamedog/vididin/VidiConst.kt +++ b/app/src/main/java/com/gamedog/vididin/VidiConst.kt @@ -8,12 +8,13 @@ object VidiConst { /** * Varous type for watching Ad */ - const val WATCH_AD_FOR_WITHDRAW = 1 - const val WATCH_AD_FOR_BOX_TASK = 2 - const val WATCH_AD_FOR_ZERO_EARN_DIAMOND = 3 - const val WATCH_AD_FOR_DAILY_WATCH_AD = 4 - const val WATCH_AD_FOR_DAILY_EARN_GOLD = 5 - const val WATCH_AD_FOR_CONVERT_GOLD_2_CASH = 6 + const val WATCH_AD_FOR_WITHDRAW_SMALL = 1 + const val WATCH_AD_FOR_WITHDRAW_BIG = 2 + const val WATCH_AD_FOR_BOX_TASK = 3 + const val WATCH_AD_FOR_ZERO_EARN_DIAMOND = 4 + const val WATCH_AD_FOR_DAILY_WATCH_AD = 5 + const val WATCH_AD_FOR_DAILY_EARN_GOLD = 6 + const val WATCH_AD_FOR_CONVERT_GOLD_2_CASH = 7 /** diff --git a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt index 99e71e8..164fa0f 100644 --- a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt @@ -90,7 +90,7 @@ class WatchAdActivity : AppViewsActivity(), OnT private fun getNotifyEventType(taskType: Int) : Int { when (taskType) { - VidiConst.WATCH_AD_FOR_WITHDRAW -> { + VidiConst.WATCH_AD_FOR_WITHDRAW_SMALL -> { return VididinEvents.EVENT_AD_WATCHED_FOR_WITHDRAW } 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 c2c465e..b8c20c8 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 @@ -10,8 +10,8 @@ import com.ama.core.architecture.util.CommonItemDecoration import com.ama.core.architecture.util.eventbus.NotifyMan import com.ama.core.architecture.util.setOnClickBatch import com.gamedog.vididin.VidiConst +import com.gamedog.vididin.manager.WithdrawItemBean import com.gamedog.vididin.manager.WithdrawManager -import com.gamedog.vididin.manager.WithdrawSubItem import com.gamedog.vididin.router.Router import com.vididin.real.money.game.R import dagger.hilt.android.AndroidEntryPoint @@ -22,7 +22,7 @@ import com.vididin.real.money.game.databinding.ActivityWithdrawSubBinding as Vie @AndroidEntryPoint class WithDrawSubActivity : AppViewsEmptyViewModelActivity() { private var mSelectedSubIndex: Int = 0 - private lateinit var mSubItemList: List + private lateinit var mCurItem: WithdrawItemBean private var mType: Int = 0 private val mAdapter: WithdrawSubAdapter by lazy { WithdrawSubAdapter() } @@ -51,28 +51,30 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity() { } private fun gotoWatchAd() { - val extraData = NotifyMan.NotifyData(1111111F) - Router.WatchAd.startActivity(this, VidiConst.WATCH_AD_FOR_WITHDRAW, AndroidUtil.object2Json(extraData)) + val extraData = NotifyMan.NotifyData(WithdrawManager.EACH_SUB_ITEM_CASH_NUM) + Router.WatchAd.startActivity(this, VidiConst.WATCH_AD_FOR_WITHDRAW_BIG, AndroidUtil.object2Json(extraData)) } override fun ViewBinding.initListeners() { - mSubItemList = WithdrawManager.instance().getSubItemList(mType) - mAdapter.submitList(mSubItemList) + mCurItem = WithdrawManager.instance().getItem(mType) + mAdapter.submitList(mCurItem.subItemList) - mSubItemList.forEach { + mCurItem.subItemList.forEach { if (it.isSelected) { mSelectedSubIndex = it.index return@forEach } } updateUI() + + recyclerView.scrollToPosition(mSelectedSubIndex) } private fun updateUI() { with(binding) { progressBar.enableTouch(false) progressBar.setBarColor(forColor = R.color.green_ce) - progressBar.setProgress(mSubItemList[mSelectedSubIndex].currentProgress) + progressBar.setProgress(mCurItem.subItemList[mSelectedSubIndex].currentProgress) } } 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 0b07671..15546d8 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 @@ -7,7 +7,6 @@ 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 -import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.router.Router import com.vididin.real.money.game.R import com.vididin.real.money.game.databinding.DialogWithdrawWatchAdBinding as ViewBinding @@ -49,7 +48,7 @@ class WithdrawWatchAdDialog(context: Activity, private var mWithdrawCashNum: Flo private fun gotoWatchVideo() { val extraData = NotifyMan.NotifyData(mWithdrawCashNum) - Router.WatchAd.startActivity(mActivity, VidiConst.WATCH_AD_FOR_WITHDRAW, AndroidUtil.object2Json(extraData)) + Router.WatchAd.startActivity(mActivity, VidiConst.WATCH_AD_FOR_WITHDRAW_SMALL, AndroidUtil.object2Json(extraData)) } 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 2c8fbb1..dce744f 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -59,11 +59,10 @@ class WithdrawManager private constructor() { return mItemList } - fun getSubItemList(itemIndex: Int): List { - return mItemList[itemIndex].subItemList + fun getItem(itemIndex: Int): WithdrawItemBean { + return mItemList[itemIndex] } - fun updateProgress(itemIndex: Int, updatedItem: WithdrawItemBean) { // TODO - }