From df332187d6e1dad512121169615b962000bf4a82 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Thu, 27 Nov 2025 19:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=A7=82=E7=9C=8B=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91dialog-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../withdraw/WithdrawInfoConfirmDialog.kt     |   1 +
 .../withdraw/WithdrawWatchAdDialog.kt         |  25 +-
 .../res/layout/dialog_withdraw_watch_ad.xml   | 284 ++++++------------
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/strings.xml           |   3 +
 5 files changed, 100 insertions(+), 216 deletions(-)

diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt
index 0fd07d4..778fdf9 100644
--- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt
@@ -38,6 +38,7 @@ class WithdrawInfoConfirmDialog(context: Context) : BindingDialog<ViewBinding>(c
                     }
 
                     tvActionApply ->  {
+                        WithdrawWatchAdDialog(context).show()
                         dismiss()
                     }
                 }
diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt
index 4b9f7b6..1c65d14 100644
--- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt
+++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt
@@ -2,11 +2,9 @@ package com.gamedog.vididin.features.withdraw
 
 
 import android.content.Context
-import com.ama.core.architecture.util.ResUtil
 import com.ama.core.architecture.util.setOnClickBatch
 import com.ama.core.architecture.widget.BindingDialog
 import com.gamedog.vididin.R
-import com.gamedog.vididin.core.login.login.AccountManager
 import com.gamedog.vididin.databinding.DialogWithdrawWatchAdBinding as ViewBinding
 import com.gamedog.vididin.router.Router
 
@@ -27,18 +25,16 @@ class WithdrawWatchAdDialog(context: Context) : BindingDialog<ViewBinding>(conte
         setCanCancel(false)
 
         mBinding.run {
-            setOnClickBatch(tvActionAlter, tvActionApply, ivClose) {
+            progressBar.setBarColor(R.color.blue_ba, R.color.blue_ff)
+
+            setOnClickBatch(flAction, ivClose) {
                 when (this) {
                     ivClose ->  {
                         dismiss()
                     }
 
-                    tvActionAlter ->  {
-                        dismiss()
-                    }
-
-                    tvActionApply ->  {
-                        dismiss()
+                    flAction ->  {
+                        gotoWatchVideo()
                     }
                 }
             }
@@ -51,18 +47,7 @@ class WithdrawWatchAdDialog(context: Context) : BindingDialog<ViewBinding>(conte
     }
 
 
-    fun setWithDrawCashNum(withdrawNum: Float): WithdrawWatchAdDialog {
-        mWithdrawCashNum = withdrawNum
 
-        mBinding.tvCashNum.text = buildString {
-            append(ResUtil.getString(R.string.cash))
-            append(" ")
-            append(mWithdrawCashNum)
-        }
-        mBinding.tvCpfAccount.text = AccountManager.getBankInfo()?.bankAccount
-
-        return this
-    }
 
 }
 
diff --git a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml
index cf38a32..938ff68 100644
--- a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml
+++ b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="300dp"
+    android:layout_width="270dp"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clipChildren="false">
@@ -28,230 +28,122 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:src="@mipmap/bg_withdraw_info_confirm_dialog"
+            android:src="@mipmap/withdraw_watch_ad_bg"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintDimensionRatio="h, 900:1026"
+            app:layout_constraintDimensionRatio="h, 810:1209"
             />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+            android:gravity="center_horizontal"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="20dp"
             android:layout_marginHorizontal="30dp">
 
-            <RelativeLayout
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/withdraw_info_confirm_title"
+                />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textSize="15sp"
+                android:textColor="@color/white"
+                android:text="@string/withdraw_ad_hint"
+                />
+
+
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    android:textColor="@color/gray3"
-                    android:text="@string/withdraw_confirm_bank_name_title"
+                    android:src="@mipmap/withdraw_watch_ad_cahs_bg"
+                    android:layout_marginTop="20dp"
                     />
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_bank_name"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="14sp"
-                    android:textColor="@color/green_ad"
-                    android:drawableStart="@mipmap/pix_small"
+                    android:gravity="center_vertical|top"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="30dp"
+                    android:orientation="horizontal">
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="30sp"
+                        android:textColor="@color/green_2c"
+                        android:text="@string/cash"
+                        android:drawableStart="@mipmap/icon_cash"
+                        />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tv_cash_num"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:textSize="30sp"
+                        android:textColor="@color/green_2c"
+                        />
+                </LinearLayout>
+
+
+
+                <com.ama.core.architecture.widget.CustomProgressBar
+                    android:id="@+id/progress_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="12dp"
+                    android:layout_marginHorizontal="40dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="20dp"
                     />
-            </RelativeLayout>
+            </FrameLayout>
 
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="26dp">
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    android:textColor="@color/gray3"
-                    android:text="@string/withdraw_confirm_auth_type"
-                    />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_auth_type"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="14sp"
-                    android:textColor="@color/gray6"
-                    android:text="@string/cpf"
-                    />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="26dp">
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    android:textColor="@color/gray3"
-                    android:text="@string/withdraw_confirm_bank_account"
-                    />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_cpf_account"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="14sp"
-                    android:textColor="@color/green_39"
-                    android:text=""
-                    />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="26dp">
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    android:textColor="@color/gray3"
-                    android:text="@string/withdraw_confirm_cash_num"
-                    />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/tv_cash_num"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="14sp"
-                    android:textColor="@color/green_39"
-                    android:text="@string/cash"
-                    />
-            </RelativeLayout>
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginHorizontal="30dp"
-            android:layout_marginBottom="40dp" >
-
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_action_alter"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_weight="1"
-                android:paddingHorizontal="14dp"
-                android:gravity="center"
-                android:background="@drawable/bg_withdraw_confirm_but_left"
-                android:textSize="18sp"
-                android:textColor="@color/blue_f9"
-                android:text="@string/alter"
+                android:id="@+id/tv_hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="30dp"
+                android:padding="8dp"
+                android:textSize="14sp"
+                android:textColor="@color/gray3"
+                android:text="@string/withdraw_watch_ad_hint"
+                android:background="@mipmap/withdraw_watch_ad_hint_bg"
                 />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_action_apply"
-                android:layout_width="0dp"
+
+            <FrameLayout
+                android:id="@+id/fl_action"
+                android:layout_width="wrap_content"
                 android:layout_height="50dp"
-                android:layout_weight="1"
-                android:layout_marginStart="20dp"
-                android:background="@drawable/bg_but_zero_buy_dialog"
-                android:textSize="18sp"
-                android:gravity="center"
-                android:textColor="@color/white"
-                android:text="@string/apply"
-                />
+                android:layout_marginTop="5dp"
+                android:background="@mipmap/bg_but_green" >
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:padding="8dp"
+                    android:textSize="18sp"
+                    android:textColor="@color/white"
+                    android:text="@string/withdraw_watch_ad_action"
+                    android:drawableStart="@mipmap/task_video"
+                    android:drawablePadding="5dp"
+                    />
+            </FrameLayout>
 
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@mipmap/withdraw_info_confirm_title"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="50dp"
-        />
-
-
-
-<!--
-
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="15dp"
-        android:layout_marginTop="60dp"
-        android:clipChildren="false"
-        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_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="18sp"
-            android:textColor="@color/white"
-            android:text="@string/understood"
-            android:gravity="center"
-            />
-
-    </LinearLayout>
--->
-
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 455f322..9d470e3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -89,5 +89,8 @@
     <color name="gray_84">#ff938a84</color>
     <color name="green_ad">#FF32BCAD</color>
     <color name="blue_f9">#FF456CF9</color>
+    <color name="green_2c">#FF02832C</color>
+    <color name="blue_ba">#FF003DBA</color>
+    <color name="blue_ff">#FF0054FF</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5cbeaca..10691fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,6 +82,9 @@
     <string name="withdraw_confirm_cash_num">Valor do saque:</string>
     <string name="alter">Alterar</string>
     <string name="apply">Solicitar</string>
+    <string name="withdraw_ad_hint">Progresso atingiu 100%! Pague agora</string>
+    <string name="withdraw_watch_ad_hint">Clique em \"Saque Já\" para acelerar</string>
+    <string name="withdraw_watch_ad_action">Saque Já</string>
 
 
 </resources>
\ No newline at end of file