跳转 及 调整ui

app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt

@@ -5,7 +5,9 @@ import com.gamedog.vididin.features.benefit.DefaultBenefitRouter
 import com.gamedog.vididin.features.winrecords.DefaultWinRecordRouter
 import com.gamedog.vididin.features.winrecords.WinRecordRouter
 import com.gamedog.vididin.features.withdraw.DefaultWithdrawRouter
+import com.gamedog.vididin.features.withdraw.DefaultWithdrawSubRouter
 import com.gamedog.vididin.features.withdraw.WithdrawRouter
+import com.gamedog.vididin.features.withdraw.WithdrawSubRouter
 import com.gamedog.vididin.features.zero.DefaultZeroBuyRouter
 import com.gamedog.vididin.features.zero.ZeroBuyRouter
 import com.gamedog.vididin.router.DefaultFeedbackRouter
@@ -53,6 +55,15 @@ object WithdrawModule {
     fun provideRouter(): WithdrawRouter = DefaultWithdrawRouter()
 }
 
+@Module
+@InstallIn(SingletonComponent::class)
+object WithdrawSubModule {
+
+    @Provides
+    @Singleton
+    fun provideRouter(): WithdrawSubRouter = DefaultWithdrawSubRouter()
+}
+
 @Module
 @InstallIn(SingletonComponent::class)
 object WinRecordModule {

app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt

@@ -7,6 +7,7 @@ import com.gamedog.vididin.core.router.interfaces.TaskRouter
 import com.gamedog.vididin.features.benefit.BenefitRouter
 import com.gamedog.vididin.features.winrecords.WinRecordRouter
 import com.gamedog.vididin.features.withdraw.WithdrawRouter
+import com.gamedog.vididin.features.withdraw.WithdrawSubRouter
 import com.gamedog.vididin.features.zero.ZeroBuyRouter
 import com.gamedog.vididin.router.IRouterFeedback
 import com.gamedog.vididin.router.IRouterPrivacy
@@ -31,6 +32,7 @@ interface RouterEntryPoint {
     fun benefitRouter(): BenefitRouter
     fun zeroBuyRouter(): ZeroBuyRouter
     fun withdrawRouter(): WithdrawRouter
+    fun withdrawSubRouter(): WithdrawSubRouter
     fun winRecordBuyRouter(): WinRecordRouter
 
 

app/src/main/java/com/gamedog/vididin/features/withdraw/DefaultWithdrawSubRouter.kt

@@ -0,0 +1,9 @@
+package com.gamedog.vididin.features.withdraw
+
+import android.app.Activity
+
+class DefaultWithdrawSubRouter: WithdrawSubRouter {
+    override fun startActivity(activity: Activity, withdrawType: Int) {
+        WithDrawSubActivity.Companion.startActivity(activity, withdrawType)
+    }
+}

app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt

@@ -101,12 +101,17 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity<ViewBinding>(), OnTabSty
         setOnClickBatch(tvSacar, withdrawRecord) {
             when(this) {
                 tvSacar -> {
-                    val hasBindBank = AccountManager.hasValidBankInfo()
-                    val cashNum = mItemViewList.get(mCurSelectedIndex).getCashNum()
-                    if (!hasBindBank) {
-                        WithdrawBindBankDialog(this@WithDrawActivity).setWithDrawCashNum(cashNum).show()
+                    if (mItemViewList.get(mCurSelectedIndex).getCashNum() > 1F) {
+                        gotoWithdrawSubActivity()
+
                     } else {
-                        WithdrawInfoConfirmDialog(this@WithDrawActivity).setWithDrawCashNum(cashNum).show()
+                        val hasBindBank = AccountManager.hasValidBankInfo()
+                        val cashNum = mItemViewList.get(mCurSelectedIndex).getCashNum()
+                        if (!hasBindBank) {
+                            WithdrawBindBankDialog(this@WithDrawActivity).setWithDrawCashNum(cashNum).show()
+                        } else {
+                            WithdrawInfoConfirmDialog(this@WithDrawActivity).setWithDrawCashNum(cashNum).show()
+                        }
                     }
                 }
 
@@ -317,7 +322,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity<ViewBinding>(), OnTabSty
     }
 
     private fun gotoWithdrawSubActivity() {
-        Router.Withdraw.startActivity(this)
+        Router.WithdrawSub.startActivity(this, 111)
     }
 
 

app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawSubActivity.kt

@@ -9,7 +9,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.ama.core.architecture.appBase.AppViewsEmptyViewModelActivity
 import com.ama.core.architecture.util.SpUtil
-import com.ama.core.architecture.util.setOnClickBatch
 import com.gamedog.vididin.VidiConst
 import com.vididin.real.money.game.R
 import com.gamedog.vididin.VididinEvents
@@ -17,14 +16,11 @@ import com.gamedog.vididin.beans.resp.PayoutCheck
 import com.gamedog.vididin.beans.resp.PayoutReply
 import com.gamedog.vididin.beans.resp.WithdrawRecord
 import com.gamedog.vididin.core.login.login.AccountManager
-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.widget.WithDrawItemView
 import com.gamedog.vididin.main.interfaces.OnTabStyleListener
 import com.gamedog.vididin.netbase.Result
-import com.gamedog.vididin.router.Router
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import kotlin.getValue
@@ -318,7 +314,7 @@ class WithDrawSubActivity : AppViewsEmptyViewModelActivity<ViewBinding>(), OnTab
         const val FINAL_STATE_ONGING = 1
         const val CHECK_DURATION = 10*1000L
 
-        internal fun startActivity(activity: Activity) {
+        internal fun startActivity(activity: Activity, withdrawType: Int) {
             activity.startActivity(Intent(activity.applicationContext, WithDrawSubActivity::class.java))
         }
     }

app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawSubRouter.kt

@@ -0,0 +1,7 @@
+package com.gamedog.vididin.features.withdraw
+
+import android.app.Activity
+
+interface WithdrawSubRouter {
+    fun startActivity(activity: Activity, withdrawType: Int)
+}

app/src/main/java/com/gamedog/vididin/router/Router.kt

@@ -9,6 +9,7 @@ import com.gamedog.vididin.di.RouterEntryPoint
 import com.gamedog.vididin.features.benefit.BenefitRouter
 import com.gamedog.vididin.features.winrecords.WinRecordRouter
 import com.gamedog.vididin.features.withdraw.WithdrawRouter
+import com.gamedog.vididin.features.withdraw.WithdrawSubRouter
 import com.gamedog.vididin.features.zero.ZeroBuyRouter
 import dagger.hilt.android.EntryPointAccessors
 import kotlin.getValue
@@ -29,6 +30,7 @@ object Router : RouterContract {
     override val Benefit: BenefitRouter by lazy { routerEntryPoint.benefitRouter() }
     override val ZeroBuy: ZeroBuyRouter by lazy { routerEntryPoint.zeroBuyRouter() }
     override val Withdraw: WithdrawRouter by lazy { routerEntryPoint.withdrawRouter() }
+    override val WithdrawSub: WithdrawSubRouter by lazy { routerEntryPoint.withdrawSubRouter() }
 
     override val WinRecord: WinRecordRouter by lazy { routerEntryPoint.winRecordBuyRouter() }
 

app/src/main/java/com/gamedog/vididin/router/RouterContract.kt

@@ -7,6 +7,7 @@ import com.gamedog.vididin.core.router.interfaces.MineRouter
 import com.gamedog.vididin.features.benefit.BenefitRouter
 import com.gamedog.vididin.features.winrecords.WinRecordRouter
 import com.gamedog.vididin.features.withdraw.WithdrawRouter
+import com.gamedog.vididin.features.withdraw.WithdrawSubRouter
 import com.gamedog.vididin.features.zero.ZeroBuyRouter
 
 
@@ -20,6 +21,7 @@ interface RouterContract {
     val Benefit: BenefitRouter
     val ZeroBuy: ZeroBuyRouter
     val Withdraw: WithdrawRouter
+    val WithdrawSub: WithdrawSubRouter
     val WinRecord: WinRecordRouter
 
     val Privacy: IRouterPrivacy

app/src/main/res/drawable/bg_round_purple_20.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ff7b5cf8" />
+    <corners android:radius="20dp"  />
+</shape>

app/src/main/res/drawable/bg_round_white_15_top.xml

@@ -2,5 +2,5 @@
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white" />
-    <corners android:topLeftRadius="25dp" android:topRightRadius="25dp" />
+    <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" />
 </shape>

app/src/main/res/layout/activity_withdraw_sub.xml

@@ -87,7 +87,7 @@
             android:layout_marginTop="30dp"
             android:paddingVertical="23dp"
             android:paddingHorizontal="15dp"
-            android:background="@drawable/bg_round_white_25_top">
+            android:background="@drawable/bg_round_white_15_top">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -154,24 +154,44 @@
 
 
 
-            <FrameLayout
-                android:id="@+id/fl_action"
-                android:layout_width="300dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@mipmap/bg_but_green"
-                android:layout_gravity="bottom|center_horizontal"
-                android:padding="12dp">
+                android:layout_gravity="bottom|center"
+                android:orientation="vertical">
+
                 <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="280dp"
                     android:layout_height="wrap_content"
-                    android:textSize="20sp"
+                    android:padding="6dp"
+                    android:textSize="14sp"
                     android:textColor="@color/white"
-                    android:text="@string/saque"
+                    android:text="@string/withdraw_sub_bottom_hint"
+                    android:gravity="center"
                     android:layout_gravity="center"
-                    android:drawableStart="@mipmap/task_video"
-                    android:drawablePadding="10dp"
+                    android:background="@drawable/bg_round_purple_20"
                     />
-            </FrameLayout>
+
+                <FrameLayout
+                    android:id="@+id/fl_action"
+                    android:layout_width="300dp"
+                    android:layout_height="wrap_content"
+                    android:background="@mipmap/bg_but_green"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="5dp"
+                    android:padding="12dp">
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="20sp"
+                        android:textColor="@color/white"
+                        android:text="@string/saque"
+                        android:layout_gravity="center"
+                        android:drawableStart="@mipmap/task_video"
+                        android:drawablePadding="10dp"
+                        />
+                </FrameLayout>
+            </LinearLayout>
 
         </FrameLayout>
 

app/src/main/res/values/strings.xml

@@ -143,5 +143,6 @@
     <string name="regras">Regras</string>
     <string name="with_draw_sub_hint">1. Grandes quantias em dinheiro sro distribuidas em vários dias;todas asrecompensas sao reais e válidas.\n2. Assistir a videos na p¡gina atual pode aumentar o progresso datarefa. Quando oprogresso atingir 100%, a recompensa diária emdinheiro pode ser reivindicada.\n3. Após reivindicar uma recompensa com sucesso, vocé podereceber a proximarecompensa em dinheiro no dia sequinte.4. Se a reivindicacao falhar, verifique se as informac\'es da contaestaopreenchidas corretamente e tente reivindicar a recompensaem dinheironovamente.\n5.Se houver comportamento de fraude, o sistema banirá a contae a colocara na</string>
     <string name="title_withdraw_sub">Recompensas Diárias em Dinheiro</string>
+    <string name="withdraw_sub_bottom_hint">Clique em \"Saque Já\" para acelerar</string>
 
 </resources>