diff --git a/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt b/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt index e3675f3..b3ece70 100644 --- a/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt +++ b/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 { diff --git a/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt b/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt index f8ea0b3..64e9f95 100644 --- a/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt +++ b/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 diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/DefaultWithdrawSubRouter.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/DefaultWithdrawSubRouter.kt new file mode 100644 index 0000000..f46ffae --- /dev/null +++ b/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) + } +} \ No newline at end of file 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 663bf7e..5c6f923 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 @@ -101,12 +101,17 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity(), 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(), OnTabSty } private fun gotoWithdrawSubActivity() { - Router.Withdraw.startActivity(this) + Router.WithdrawSub.startActivity(this, 111) } 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 35a2a7d..63b6aaa 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 @@ -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(), 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)) } } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawSubRouter.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawSubRouter.kt new file mode 100644 index 0000000..a0d2029 --- /dev/null +++ b/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) +} \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/router/Router.kt b/app/src/main/java/com/gamedog/vididin/router/Router.kt index 41717c0..ca741e4 100644 --- a/app/src/main/java/com/gamedog/vididin/router/Router.kt +++ b/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() } diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt b/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt index f4697af..207d828 100644 --- a/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt +++ b/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 diff --git a/app/src/main/res/drawable/bg_round_purple_20.xml b/app/src/main/res/drawable/bg_round_purple_20.xml new file mode 100644 index 0000000..eef8648 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_purple_20.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/bg_round_white_25_top.xml b/app/src/main/res/drawable/bg_round_white_15_top.xml similarity index 71% rename from app/src/main/res/drawable/bg_round_white_25_top.xml rename to app/src/main/res/drawable/bg_round_white_15_top.xml index c82bf09..a024453 100644 --- a/app/src/main/res/drawable/bg_round_white_25_top.xml +++ b/app/src/main/res/drawable/bg_round_white_15_top.xml @@ -2,5 +2,5 @@ - + diff --git a/app/src/main/res/layout/activity_withdraw_sub.xml b/app/src/main/res/layout/activity_withdraw_sub.xml index fdbfd9a..8dc0457 100644 --- a/app/src/main/res/layout/activity_withdraw_sub.xml +++ b/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"> + android:layout_gravity="bottom|center" + android:orientation="vertical"> + - + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b43b87..cba2645 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -143,5 +143,6 @@ Regras 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 Recompensas Diárias em Dinheiro + Clique em \"Saque Já\" para acelerar \ No newline at end of file