From 02fc928f20c31c5f228d5a5244ad0c185c6994f5 Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Tue, 30 Jun 2026 14:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login/ForgetPasswordActivity.kt           |  5 ++---
 .../defense_device/login/RegisterActivity.kt  |  5 ++---
 .../personal/RetrievePasswordActivity.kt      |  2 +-
 .../res/layout/forget_password_activity.xml   | 19 ++++++++++---------
 app/src/main/res/layout/register_activity.xml | 13 +++++++------
 .../res/layout/retrieve_password_activity.xml | 10 ++++++----
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt
index 1a68eb6..5733167 100644
--- a/app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt
@@ -108,11 +108,10 @@ class ForgetPasswordActivity : AppCompatActivity() {
      * 开始验证码按钮倒计时
      */
     private fun startCountDown() {
+        binding.sendCodeBtn.isEnabled = false
         countDownTimer = object : CountDownTimer(COUNTDOWN_DURATION, COUNTDOWN_INTERVAL) {
             override fun onTick(millisUntilFinished: Long) {
-                val secondsRemaining = (millisUntilFinished / 1000).toInt()
-                binding.sendCodeBtn.text = "${secondsRemaining}秒后重试"
-                binding.sendCodeBtn.isEnabled = false
+                binding.sendCodeBtn.text = getString(R.string.countdown_retry, millisUntilFinished / 1000)
             }
 
             override fun onFinish() {
diff --git a/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt
index 4558c6d..522a0a7 100644
--- a/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt
@@ -100,11 +100,10 @@ class RegisterActivity : AppCompatActivity() {
     }
 
     private fun startCountDown() {
+        binding.sendCodeBtn.isEnabled = false
         countDownTimer = object : CountDownTimer(COUNTDOWN_DURATION, COUNTDOWN_INTERVAL) {
             override fun onTick(millisUntilFinished: Long) {
-                val secondsRemaining = (millisUntilFinished / 1000).toInt()
-                binding.sendCodeBtn.text = "${secondsRemaining}秒后重试"
-                binding.sendCodeBtn.isEnabled = false
+                binding.sendCodeBtn.text = getString(R.string.countdown_retry, millisUntilFinished / 1000)
             }
 
             override fun onFinish() {
diff --git a/app/src/main/java/com/ckkj/defense_device/personal/RetrievePasswordActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/RetrievePasswordActivity.kt
index 577fa2c..10f4940 100644
--- a/app/src/main/java/com/ckkj/defense_device/personal/RetrievePasswordActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/personal/RetrievePasswordActivity.kt
@@ -163,7 +163,7 @@ class RetrievePasswordActivity : AppCompatActivity() {
             override fun onFinish() {
                 isCountingDown = false
                 binding.btnGetCode.isEnabled = true
-                binding.btnGetCode.text = getString(R.string.get_verification_code)
+                binding.btnGetCode.text = getString(R.string.resend_code)
             }
         }.start()
     }
diff --git a/app/src/main/res/layout/forget_password_activity.xml b/app/src/main/res/layout/forget_password_activity.xml
index 6b77881..b76c6c1 100644
--- a/app/src/main/res/layout/forget_password_activity.xml
+++ b/app/src/main/res/layout/forget_password_activity.xml
@@ -140,19 +140,20 @@
         <!-- 发送验证码按钮 -->
         <android.widget.Button
             android:id="@+id/sendCodeBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/send_code"
-            android:textSize="16sp"
+            android:layout_width="110dp"
+            android:layout_height="36dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/send_sms_code"
+            android:textSize="14sp"
             android:textColor="@color/white"
-            android:background="@drawable/rounded_blue_bg"
-            android:paddingHorizontal="12dp"
-            android:maxWidth="120dp"
+            android:background="@drawable/send_code_btn_selector"
+            android:elevation="0dp"
+            android:stateListAnimator="@null"
+            android:gravity="center"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:elevation="0dp"
-            android:stateListAnimator="@null"
             android:layout_marginStart="12dp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/register_activity.xml b/app/src/main/res/layout/register_activity.xml
index fdae346..e4ba92a 100644
--- a/app/src/main/res/layout/register_activity.xml
+++ b/app/src/main/res/layout/register_activity.xml
@@ -140,16 +140,17 @@
         <!-- 发送验证码按钮 -->
         <android.widget.Button
             android:id="@+id/sendCodeBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="110dp"
+            android:layout_height="36dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
             android:text="@string/send_sms_code"
-            android:textSize="16sp"
+            android:textSize="14sp"
             android:textColor="@color/white"
-            android:background="@drawable/rounded_blue_bg"
-            android:paddingHorizontal="12dp"
-            android:maxWidth="120dp"
+            android:background="@drawable/send_code_btn_selector"
             android:elevation="0dp"
             android:stateListAnimator="@null"
+            android:gravity="center"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/retrieve_password_activity.xml b/app/src/main/res/layout/retrieve_password_activity.xml
index 9a17b66..9f5f24e 100644
--- a/app/src/main/res/layout/retrieve_password_activity.xml
+++ b/app/src/main/res/layout/retrieve_password_activity.xml
@@ -82,17 +82,19 @@
 
                 <android.widget.Button
                     android:id="@+id/btnGetCode"
-                    android:layout_width="wrap_content"
+                    android:layout_width="110dp"
                     android:layout_height="36dp"
+                    android:minWidth="0dp"
+                    android:minHeight="0dp"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="8dp"
-                    android:background="@drawable/rounded_blue_bg"
-                    android:paddingHorizontal="16dp"
-                    android:text="@string/get_verification_code"
+                    android:background="@drawable/send_code_btn_selector"
+                    android:text="@string/send_sms_code"
                     android:textColor="@color/white"
                     android:elevation="0dp"
                     android:stateListAnimator="@null"
+                    android:gravity="center"
                     android:textSize="14sp" />
             </RelativeLayout>