From 5c73f167603693d5e015193730bf16f3b6bb2bf5 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 25 三月 2025 13:47:54 +0800
Subject: [PATCH] fix 1111
---
app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt b/app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt
index caec2fe..457e213 100644
--- a/app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt
@@ -29,6 +29,7 @@
private fun setupViews() {
binding.apply {
btnBack.setOnClickListener {
+ startActivity(Intent(this@PhoneLoginActivity, LoginActivity::class.java))
finish()
}
@@ -37,7 +38,6 @@
if (phone.length == 11) {
viewModel.sendVerificationCode(phone)
startCountDown()
-// 17625318565 111111
} else {
Toast.makeText(this@PhoneLoginActivity,
"请输入正确的手机号", Toast.LENGTH_SHORT).show()
@@ -58,12 +58,31 @@
}
private fun observeViewModel() {
+ // 观察登录状态
viewModel.loginState.observe(this) { isLoggedIn ->
if (isLoggedIn) {
startActivity(Intent(this, MainActivity::class.java))
finishAffinity() // 结束所有之前的Activity
}
}
+ // 观察消息提示
+ viewModel.loginMessage.observe(this) { message ->
+ Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+ if (message == "验证码已发送") {
+ startCountDown()
+ }
+ }
+
+ // 观察加载状态
+ viewModel.isLoading.observe(this) { isLoading ->
+ binding.btnLogin.isEnabled = !isLoading
+ if (isLoading) {
+ binding.btnLogin.text = "登录中..."
+ } else {
+ binding.btnLogin.text = "登录"
+ }
+ }
+
}
private fun startCountDown() {
--
Gitblit v1.9.3