调整传入参数

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_WITHDRAW_SMALL = 1
-    const val WATCH_AD_FOR_BOX_TASK = 2
+    const val WATCH_AD_FOR_WITHDRAW_BIG = 2
-    const val WATCH_AD_FOR_ZERO_EARN_DIAMOND = 3
+    const val WATCH_AD_FOR_BOX_TASK = 3
-    const val WATCH_AD_FOR_DAILY_WATCH_AD = 4
+    const val WATCH_AD_FOR_ZERO_EARN_DIAMOND = 4
-    const val WATCH_AD_FOR_DAILY_EARN_GOLD = 5
+    const val WATCH_AD_FOR_DAILY_WATCH_AD = 5
-    const val WATCH_AD_FOR_CONVERT_GOLD_2_CASH = 6
+    const val WATCH_AD_FOR_DAILY_EARN_GOLD = 6
+    const val WATCH_AD_FOR_CONVERT_GOLD_2_CASH = 7
 
 
     /**

app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt

@@ -90,7 +90,7 @@ class WatchAdActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), 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
             }
 

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<ViewBinding>() {
     private var mSelectedSubIndex: Int = 0
-    private lateinit var mSubItemList: List<WithdrawSubItem>
+    private lateinit var mCurItem: WithdrawItemBean
     private var mType: Int = 0
     private val mAdapter: WithdrawSubAdapter by lazy { WithdrawSubAdapter() }
 
@@ -51,28 +51,30 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity<ViewBinding>() {
     }
 
     private fun gotoWatchAd() {
-        val extraData = NotifyMan.NotifyData<Float>(1111111F)
+        val extraData = NotifyMan.NotifyData<Float>(WithdrawManager.EACH_SUB_ITEM_CASH_NUM)
-        Router.WatchAd.startActivity(this, VidiConst.WATCH_AD_FOR_WITHDRAW, AndroidUtil.object2Json(extraData))
+        Router.WatchAd.startActivity(this, VidiConst.WATCH_AD_FOR_WITHDRAW_BIG, AndroidUtil.object2Json(extraData))
     }
 
     override fun ViewBinding.initListeners() {
-        mSubItemList = WithdrawManager.instance().getSubItemList(mType)
+        mCurItem = WithdrawManager.instance().getItem(mType)
-        mAdapter.submitList(mSubItemList)
+        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)
         }
     }
 

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<Float>(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))
     }
 
 

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<WithdrawSubItem> {
+    fun getItem(itemIndex: Int): WithdrawItemBean {
-        return mItemList[itemIndex].subItemList
+        return mItemList[itemIndex]
     }
 
-
     fun updateProgress(itemIndex: Int, updatedItem: WithdrawItemBean) {
         // TODO -
     }