admin/rider-pro-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改BUG：登录账号邮箱格式错误无提示

Browse Source
This commit is contained in:
zhong
2025-11-06 10:53:34 +08:00
parent baa6f284bd
commit cc12a08472
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt
View File

@@ -67,7 +67,7 @@ fun EmailSignupScreen() {
email.isEmpty() -> context.getString(R.string.text_error_email_required)
// 邮箱格式
!android.util.Patterns.EMAIL_ADDRESS.matcher(email)
.matches() -> context.getString(R.string.text_error_email_format)
.matches() -> context.getString(R.string.text_error_email_format_1)
else -> null
}

13
app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt
View File

@@ -72,8 +72,17 @@ fun UserAuthScreen() {
var passwordError by remember { mutableStateOf<String?>(null) }
var captchaInfo by remember { mutableStateOf<CaptchaInfo?>(null) }
fun validateForm(): Boolean {
emailError =
if (email.isEmpty()) context.getString(R.string.text_error_email_required) else null
// 如果密码为空，先检查邮箱格式
if (password.isEmpty()) {
emailError = when {
email.isEmpty() -> context.getString(R.string.text_error_email_required)
!android.util.Patterns.EMAIL_ADDRESS.matcher(email).matches() ->
context.getString(R.string.text_error_email_format)
else -> null
}
} else {
emailError = if (email.isEmpty()) context.getString(R.string.text_error_email_required) else null
}
// 使用通用密码校验器
val passwordValidation = PasswordValidator.validateCurrentPassword(password, context)