From acb5be78c07b8499d0a38515b05a4982207c1c9a Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 15:24:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 8432373..8931e27 100644
--- a/app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/PhoneLoginActivity.kt
@@ -31,7 +31,7 @@
binding.apply {
// 设置上次登录的手机号
etPhone.setText(PreferencesManager.getLastLoginPhone())
-
+
btnBack.setOnClickListener {
startActivity(Intent(this@PhoneLoginActivity, LoginActivity::class.java))
finish()
@@ -43,21 +43,26 @@
viewModel.sendVerificationCode(phone)
startCountDown()
} else {
- Toast.makeText(this@PhoneLoginActivity,
- "请输入正确的手机号", Toast.LENGTH_SHORT).show()
+ Toast.makeText(
+ this@PhoneLoginActivity,
+ "请输入正确的手机号", Toast.LENGTH_SHORT
+ ).show()
}
}
btnLogin.setOnClickListener {
val phone = etPhone.text.toString()
val code = etCode.text.toString()
+ val invite = etInvite.text.toString()
if (phone.length == 11 && code.length == 6) {
// 保存登录的手机号
PreferencesManager.saveLastLoginPhone(phone)
- viewModel.login(phone, code)
+ viewModel.login(phone, code, invite)
} else {
- Toast.makeText(this@PhoneLoginActivity,
- "请输入完整信息", Toast.LENGTH_SHORT).show()
+ Toast.makeText(
+ this@PhoneLoginActivity,
+ "请输入完整信息", Toast.LENGTH_SHORT
+ ).show()
}
}
}
--
Gitblit v1.9.3