银行账号数据结构 绑定dialog UI

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,
+)

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<ViewBinding, UiState, ViewModel>(), 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<ViewBinding, UiState, ViewModel>(), 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()
     }
 

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

@@ -17,8 +17,8 @@ class WithdrawBindBankDialog(context: Context) : BindingDialog<ViewBinding>(cont
 
     private fun build() {
         with()
-        setCenter()
+        setBottom()
-        setMaskValue(0.8f)
+        setMaskValue(0.9f)
         setCanCancel(false)
 
         mBinding.run {

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

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffffff" />
+    <corners android:topLeftRadius="15dp"  android:topRightRadius="15dp" />
+</shape>
+
+
+

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffeeeeee" />
+    <corners android:topLeftRadius="25dp" android:topRightRadius="25dp" android:bottomLeftRadius="25dp" android:bottomRightRadius="25dp" />
+</shape>
+
+

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"
         />
 

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"/>
 
 
 </LinearLayout>

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"
         />

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

@@ -2,75 +2,113 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
-
+    android:paddingVertical="20dp"
-
+    android:paddingHorizontal="15dp"
-    <androidx.appcompat.widget.AppCompatImageView
+    android:background="@drawable/bg_binding_bank_dialog"
-        android:id="@+id/iv_close"
+    >
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_gravity="end"
-        android:src="@mipmap/icon_close"
-        android:layout_marginEnd="30dp"
-        />
-
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="500dp"
-        android:orientation="vertical"
+        android:orientation="vertical">
-        android:padding="15dp"
+        <RelativeLayout
-        android:layout_marginTop="60dp"
+            android:layout_width="match_parent"
-        android:clipChildren="false"
+            android:layout_height="wrap_content" >
-        android:gravity="center_horizontal"
-        android:background="@drawable/bg_benefit_top_white"
-        >
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/gray3"
+                android:text="@string/bind_bank_title"
+                />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/iv_close"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="end"
+                android:src="@mipmap/icon_close"
+                android:tint="@color/black"
+                android:layout_marginEnd="30dp"
+                android:layout_alignParentEnd="true"
+                />
+        </RelativeLayout>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textSize="18sp"
-            android:textColor="@color/black_28"
-            android:text="@string/zero_buy_rule_dialog_title"
-            />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:textSize="14sp"
-            android:textColor="@color/gray6"
-            android:text="@string/zero_buy_rule_dialog_descript"
-            />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_rules_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textSize="14sp"
-            android:textColor="@color/gray9"
-            android:text="@string/zero_buy_rule_dialog_rule"
-            />
-
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_confirm"
-            android:layout_width="240dp"
-            android:layout_height="50dp"
             android:layout_marginTop="20dp"
-            android:background="@drawable/bg_but_zero_buy_dialog"
+            android:textSize="14sp"
-            android:textSize="18sp"
+            android:textStyle="bold"
-            android:textColor="@color/white"
+            android:textColor="@color/gray9"
-            android:text="@string/understood"
+            android:text="@string/bind_bank_desc"
-            android:gravity="center"
             />
 
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="20dp"
+            android:gravity="center_vertical"
+            android:paddingVertical="16dp"
+            android:paddingHorizontal="20dp"
+            android:background="@drawable/bg_binding_bank_edit">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_cpf_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="15sp"
+                android:textStyle="bold"
+                android:textColor="@color/gray3"
+                android:text="@string/bind_bank_cpf_title"
+                />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/tv_cpf_edit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginHorizontal="10dp"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                android:background="@null"
+                android:textColor="@color/gray6"
+                android:hint="Please Input you CPF number"
+                />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/iv_state"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="end"
+                android:src="@mipmap/icon_success"
+                android:layout_alignParentEnd="true"
+                />
+        </LinearLayout>
     </LinearLayout>
 
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="46dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/bg_but_zero_buy_dialog"
+        android:textSize="18sp"
+        android:textColor="@color/white"
+        android:text="@string/continue1"
+        android:gravity="center"
+        android:layout_gravity="bottom"
+        />
+
 </FrameLayout>

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"
         />
 

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"
         />
 

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"
         />
 

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"
         />
 

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"
         />
 

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"
         />
 

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"
         />
 

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

@@ -70,6 +70,11 @@
     <string name="daily_sign_but_text_1">Fazer Login Agora</string>
     <string name="daily_sign_but_text_2">Recuperar Login</string>
     <string name="daily_sign_but_text_3">Disponível amanhã</string>
+    <string name="bind_bank_title">Informações de retirada</string>
+    <string name="bind_bank_desc">*Atenção: Para garantir que seu saque seja processado sem problemas, preencha os dados corretamente.</string>
+    <string name="bind_bank_cpf_title">#CPF</string>
+    <string name="continue1">Continuar</string>
+
 
 
 </resources>