From e28e16708590ec8a726aba74f915c918199c003c Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Tue, 30 Jun 2026 11:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=8A=A8=E6=80=81=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login/ForgetPasswordActivity.kt               |  2 +-
 .../ckkj/defense_device/login/LoginActivity.kt    | 14 ++++++++++----
 .../ckkj/defense_device/login/RegisterActivity.kt |  2 +-
 app/src/main/res/layout/activity_login.xml        | 15 ++++++++-------
 .../main/res/layout/forget_password_activity.xml  |  4 +---
 app/src/main/res/values-zh/strings.xml            |  1 +
 app/src/main/res/values/strings.xml               |  1 +
 7 files changed, 23 insertions(+), 16 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 300addd..1a68eb6 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
@@ -127,7 +127,7 @@ class ForgetPasswordActivity : AppCompatActivity() {
     private fun resetSendButton() {
         countDownTimer?.cancel()
         countDownTimer = null
-        binding.sendCodeBtn.text = "发送验证码"
+        binding.sendCodeBtn.text = getString(R.string.resend_code)
         binding.sendCodeBtn.isEnabled = true
     }
 
diff --git a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
index 8e6ff87..b52f782 100644
--- a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
@@ -28,6 +28,7 @@ class LoginActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityLoginBinding
     private var currentLoginMode = LoginMode.SMS
+    private var countDownTimer: CountDownTimer? = null
 
     enum class LoginMode { SMS, PASSWORD }
 
@@ -169,25 +170,24 @@ class LoginActivity : AppCompatActivity() {
         binding.registerText.setOnClickListener {
             val intent= Intent(this, RegisterActivity::class.java)
             startActivity(intent)
-            Toast.makeText(this, R.string.redirect_register_page, Toast.LENGTH_SHORT).show()
         }
 
         binding.forgetText.setOnClickListener {
             val intent= Intent(this, ForgetPasswordActivity::class.java)
             startActivity(intent)
-            Toast.makeText(this, R.string.forgot_password_page, Toast.LENGTH_SHORT).show()
         }
     }
 
     private fun startCountDown() {
         binding.sendCodeBtn.isEnabled = false
-        object : CountDownTimer(60000, 1000) {
+        countDownTimer = object : CountDownTimer(60000, 1000) {
             override fun onTick(millisUntilFinished: Long) {
                 binding.sendCodeBtn.text = getString(R.string.countdown_retry, millisUntilFinished / 1000)
             }
             override fun onFinish() {
-                binding.sendCodeBtn.text = getString(R.string.send_code)
+                binding.sendCodeBtn.text = getString(R.string.resend_code)
                 binding.sendCodeBtn.isEnabled = true
+                countDownTimer = null
             }
         }.start()
     }
@@ -289,4 +289,10 @@ class LoginActivity : AppCompatActivity() {
         gradientDrawable.gradientType = GradientDrawable.LINEAR_GRADIENT
         view.background = gradientDrawable
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        countDownTimer?.cancel()
+        countDownTimer = null
+    }
 }
\ No newline at end of file
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 ac2e7c9..4558c6d 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
@@ -116,7 +116,7 @@ class RegisterActivity : AppCompatActivity() {
     private fun resetSendButton() {
         countDownTimer?.cancel()
         countDownTimer = null
-        binding.sendCodeBtn.text = getString(R.string.send_code)
+        binding.sendCodeBtn.text = getString(R.string.resend_code)
         binding.sendCodeBtn.isEnabled = true
         isSendingCode = false
     }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 15c3fd1..5d7037c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -156,16 +156,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:textColor="@color/white"
-            android:background="@drawable/rounded_blue_bg"
-            android:paddingHorizontal="12dp"
-            android:maxWidth="120dp"
+            android:textSize="14sp"
+            android:textColor="@color/send_code_text_color"
+            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/forget_password_activity.xml b/app/src/main/res/layout/forget_password_activity.xml
index 4b16ad8..6b77881 100644
--- a/app/src/main/res/layout/forget_password_activity.xml
+++ b/app/src/main/res/layout/forget_password_activity.xml
@@ -15,9 +15,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
+        app:layout_constraintEnd_toEndOf="parent">
         <ImageView
             android:id="@+id/backIcon"
             android:layout_width="24dp"
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 897a9a3..7241a66 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -340,6 +340,7 @@
     <string name="enter_phone_number">请输入手机号</string>
     <string name="enter_verification_code">请输入验证码</string>
     <string name="send_code">发送验证码</string>
+    <string name="resend_code">重新发送</string>
     <string name="enter_new_password">请输入新密码</string>
     <string name="enter_password_again">请再次输入新密码</string>
     <string name="determine">确定</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cdebc9e..9d8ec4d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -329,6 +329,7 @@
     <string name="enter_phone_number">Enter phone number</string>
     <string name="enter_verification_code">Enter verification code</string>
     <string name="send_code">Send Code</string>
+    <string name="resend_code">Resend</string>
     <string name="enter_new_password">Enter new password</string>
     <string name="enter_password_again">Enter password again</string>
     <string name="determine">Confirm</string>