diff --git a/app/src/main/java/com/gamedog/vididin/beans/Account.kt b/app/src/main/java/com/gamedog/vididin/beans/Account.kt index 7d9f2a3..fcfcce4 100644 --- a/app/src/main/java/com/gamedog/vididin/beans/Account.kt +++ b/app/src/main/java/com/gamedog/vididin/beans/Account.kt @@ -8,4 +8,11 @@ data class Account( val createdAt: Long, var goldCount: Long = 0L, var cashCount: Float = 0F, + var bankInfo: BankInfo? = null, ) + + +data class BankInfo( + val bankName: String = "Pix2", + var bankAccount: String, +) 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 5ccb8b2..8a05716 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,10 +5,10 @@ import android.content.Intent import android.view.LayoutInflater import androidx.activity.viewModels import com.ama.core.architecture.appBase.AppViewsActivity -import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.setOnClickBatch import com.gamedog.vididin.R import com.gamedog.vididin.VididinEvents +import com.gamedog.vididin.beans.Account import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.features.withdraw.widget.WithDrawItemView import com.gamedog.vididin.main.interfaces.OnTabStyleListener @@ -36,56 +36,6 @@ class WithDrawActivity : AppViewsActivity(), On } override fun ViewBinding.initViews() { - with(binding) { - withdraw01.setNumAndAction(0, 0.1F, - { itemIndex-> - updateUIItemSelectStates(itemIndex) - }) - - withdraw10.setNumAndAction(1, 10F, - { itemIndex-> - updateUIItemSelectStates(itemIndex) - }) - - withdraw20.setNumAndAction(2, 20F, - { itemIndex-> - updateUIItemSelectStates(itemIndex) - }) - - withdraw50.setNumAndAction(3, 50F, - { itemIndex-> - updateUIItemSelectStates(itemIndex) - }) - - withdraw100.setNumAndAction(4, 100F, - { itemIndex-> - updateUIItemSelectStates(itemIndex) - }) - - withdraw300.setNumAndAction(5, 300F, - { itemIndex-> - updateUIItemSelectStates(itemIndex) - }) - - withdrawPix2.setIconAndText(R.mipmap.pix2, R.string.pix2, { - - }) - - - - updateUIItemSelectStates(0) - setOnClickBatch(tvSacar, withdrawRecord) { - when(this) { - tvSacar -> { - - } - withdrawRecord -> { - Router.WithdrawRecord.startActivity(this@WithDrawActivity) - } - } - } - } - mItemViewList.add(withdraw01) mItemViewList.add(withdraw10) mItemViewList.add(withdraw20) @@ -93,6 +43,59 @@ class WithDrawActivity : AppViewsActivity(), On mItemViewList.add(withdraw100) mItemViewList.add(withdraw300) + withdraw01.setNumAndAction(0, 0.1F, + { itemIndex-> + updateUIItemSelectStates(itemIndex) + }) + + withdraw10.setNumAndAction(1, 10F, + { itemIndex-> + updateUIItemSelectStates(itemIndex) + }) + + withdraw20.setNumAndAction(2, 20F, + { itemIndex-> + updateUIItemSelectStates(itemIndex) + }) + + withdraw50.setNumAndAction(3, 50F, + { itemIndex-> + updateUIItemSelectStates(itemIndex) + }) + + withdraw100.setNumAndAction(4, 100F, + { itemIndex-> + updateUIItemSelectStates(itemIndex) + }) + + withdraw300.setNumAndAction(5, 300F, + { itemIndex-> + updateUIItemSelectStates(itemIndex) + }) + + withdrawPix2.setIconAndText(R.mipmap.pix2, R.string.pix2, { + + }) + + + withdrawPix2.setSelectedState(true) + updateUIItemSelectStates(0) + + setOnClickBatch(tvSacar, withdrawRecord) { + when(this) { + tvSacar -> { + val hasBindBank = AccountManager.hasValidBankInfo() + if (!hasBindBank) { + WithdrawBindBankDialog(this@WithDrawActivity).show() + } + } + + withdrawRecord -> { + Router.WithdrawRecord.startActivity(this@WithDrawActivity) + } + } + } + updateUICashTotal() } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt index 3ae95fb..9b2544d 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt @@ -17,8 +17,8 @@ class WithdrawBindBankDialog(context: Context) : BindingDialog(cont private fun build() { with() - setCenter() - setMaskValue(0.8f) + setBottom() + setMaskValue(0.9f) setCanCancel(false) mBinding.run { diff --git a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt index 27066d8..769bf18 100644 --- a/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt +++ b/app/src/main/java/com/gamedog/vididin/login/AccountManager.kt @@ -6,7 +6,7 @@ import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.eventbus.NotifyMan import com.gamedog.vididin.VididinEvents import com.gamedog.vididin.beans.Account - +import com.gamedog.vididin.beans.BankInfo object AccountManager { @@ -51,6 +51,14 @@ object AccountManager { NotifyMan.instance().sendEvent(VididinEvents.Event_Account_Cash_Changed, null) } + fun getBankInfo(): BankInfo? { + return mAccount?.bankInfo + } + + fun hasValidBankInfo(): Boolean { + val backInfo = getBankInfo() + return !backInfo?.bankName.isNullOrEmpty() && !backInfo.bankAccount.isNullOrEmpty() + } } diff --git a/app/src/main/res/drawable/bg_binding_bank_dialog.xml b/app/src/main/res/drawable/bg_binding_bank_dialog.xml new file mode 100644 index 0000000..1b6255a --- /dev/null +++ b/app/src/main/res/drawable/bg_binding_bank_dialog.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/bg_binding_bank_edit.xml b/app/src/main/res/drawable/bg_binding_bank_edit.xml new file mode 100644 index 0000000..11b98ba --- /dev/null +++ b/app/src/main/res/drawable/bg_binding_bank_edit.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/app/src/main/res/layout/dialog_daily_sign.xml b/app/src/main/res/layout/dialog_daily_sign.xml index 2b07c7d..43eeaf9 100644 --- a/app/src/main/res/layout/dialog_daily_sign.xml +++ b/app/src/main/res/layout/dialog_daily_sign.xml @@ -334,7 +334,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/layout/dialog_daily_sign_success.xml b/app/src/main/res/layout/dialog_daily_sign_success.xml index 7c94f98..373d612 100644 --- a/app/src/main/res/layout/dialog_daily_sign_success.xml +++ b/app/src/main/res/layout/dialog_daily_sign_success.xml @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="64dp" - android:src="@mipmap/icon_close"/> + android:src="@mipmap/icon_close_with_circle"/> diff --git a/app/src/main/res/layout/dialog_watch_video.xml b/app/src/main/res/layout/dialog_watch_video.xml index 5585d8d..bc16c18 100644 --- a/app/src/main/res/layout/dialog_watch_video.xml +++ b/app/src/main/res/layout/dialog_watch_video.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="right" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" android:layout_marginTop="10dp" /> diff --git a/app/src/main/res/layout/dialog_withdraw_binding_bank.xml b/app/src/main/res/layout/dialog_withdraw_binding_bank.xml index e5f7f8b..e6bb92b 100644 --- a/app/src/main/res/layout/dialog_withdraw_binding_bank.xml +++ b/app/src/main/res/layout/dialog_withdraw_binding_bank.xml @@ -2,75 +2,113 @@ - - - - + android:layout_height="wrap_content" + android:paddingVertical="20dp" + android:paddingHorizontal="15dp" + android:background="@drawable/bg_binding_bank_dialog" + > + android:layout_height="500dp" + android:orientation="vertical"> + + + + + - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_withdraw_binding_bank_finish.xml b/app/src/main/res/layout/dialog_withdraw_binding_bank_finish.xml index e5f7f8b..e61f5cf 100644 --- a/app/src/main/res/layout/dialog_withdraw_binding_bank_finish.xml +++ b/app/src/main/res/layout/dialog_withdraw_binding_bank_finish.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/layout/dialog_withdraw_fail.xml b/app/src/main/res/layout/dialog_withdraw_fail.xml index e5f7f8b..e61f5cf 100644 --- a/app/src/main/res/layout/dialog_withdraw_fail.xml +++ b/app/src/main/res/layout/dialog_withdraw_fail.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/layout/dialog_withdraw_success.xml b/app/src/main/res/layout/dialog_withdraw_success.xml index e5f7f8b..e61f5cf 100644 --- a/app/src/main/res/layout/dialog_withdraw_success.xml +++ b/app/src/main/res/layout/dialog_withdraw_success.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/layout/dialog_zero_buy_fail.xml b/app/src/main/res/layout/dialog_zero_buy_fail.xml index e5f7f8b..e61f5cf 100644 --- a/app/src/main/res/layout/dialog_zero_buy_fail.xml +++ b/app/src/main/res/layout/dialog_zero_buy_fail.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/layout/dialog_zero_buy_not_win.xml b/app/src/main/res/layout/dialog_zero_buy_not_win.xml index e5f7f8b..e61f5cf 100644 --- a/app/src/main/res/layout/dialog_zero_buy_not_win.xml +++ b/app/src/main/res/layout/dialog_zero_buy_not_win.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/layout/dialog_zero_buy_rule.xml b/app/src/main/res/layout/dialog_zero_buy_rule.xml index e5f7f8b..e61f5cf 100644 --- a/app/src/main/res/layout/dialog_zero_buy_rule.xml +++ b/app/src/main/res/layout/dialog_zero_buy_rule.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/layout/dialog_zero_buy_win.xml b/app/src/main/res/layout/dialog_zero_buy_win.xml index e5f7f8b..e61f5cf 100644 --- a/app/src/main/res/layout/dialog_zero_buy_win.xml +++ b/app/src/main/res/layout/dialog_zero_buy_win.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="end" - android:src="@mipmap/icon_close" + android:src="@mipmap/icon_close_with_circle" android:layout_marginEnd="30dp" /> diff --git a/app/src/main/res/mipmap-xxhdpi/icon_close.webp b/app/src/main/res/mipmap-xxhdpi/icon_close.webp new file mode 100644 index 0000000..082a489 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_close.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_close.png b/app/src/main/res/mipmap-xxhdpi/icon_close_with_circle.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_close.png rename to app/src/main/res/mipmap-xxhdpi/icon_close_with_circle.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_fail.webp b/app/src/main/res/mipmap-xxhdpi/icon_fail.webp new file mode 100644 index 0000000..50a6046 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_fail.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_success.webp b/app/src/main/res/mipmap-xxhdpi/icon_success.webp new file mode 100644 index 0000000..dc71e85 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_success.webp differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c60463..aeb42f7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -70,6 +70,11 @@ Fazer Login Agora Recuperar Login Disponível amanhã + Informações de retirada + *Atenção: Para garantir que seu saque seja processado sem problemas, preencha os dados corretamente. + #CPF + Continuar + \ No newline at end of file