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 @@
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 @@