diff --git a/app/src/main/java/com/catshark/lpt/LptApp.kt b/app/src/main/java/com/catshark/lpt/LptApp.kt index d0fd5bf..a96d185 100644 --- a/app/src/main/java/com/catshark/lpt/LptApp.kt +++ b/app/src/main/java/com/catshark/lpt/LptApp.kt @@ -46,6 +46,14 @@ class AppContainer(private val app: Application) { private val _baseUrl = MutableStateFlow(ApiClient.DEFAULT_BASE_URL) val baseUrl: StateFlow = _baseUrl.asStateFlow() + /** 登录在途标记:防重复提交 */ + @Volatile + private var authInFlight = false + + /** API 地址保存在途标记 */ + @Volatile + private var baseUrlSaving = false + /** 登录页要展示的一次性提示(比如 token 失效),登录成功后清除 */ private val _authNotice = MutableStateFlow(null) val authNotice: StateFlow = _authNotice.asStateFlow() @@ -71,23 +79,30 @@ class AppContainer(private val app: Application) { } fun login(username: String, password: String, baseUrl: String, onResult: (String?) -> Unit) { + // 在途时直接忽略重复提交:登录是重操作,不能因为手抖发两次 + if (authInFlight) return + authInFlight = true scope.launch { - if (!apiClient.setBaseUrl(baseUrl)) { - onResult("API 地址不合法,需要形如 https://host/api") - return@launch - } - repository.login(username, password) - .onSuccess { token -> - apiClient.token = token - tokenStore.saveLogin(token, username, baseUrl) - _baseUrl.value = baseUrl - _username.value = username - _authNotice.value = null - _loggedIn.value = true - session.reconcile() - onResult(null) + try { + if (!apiClient.setBaseUrl(baseUrl)) { + onResult("API 地址不合法,需要形如 https://host/api") + return@launch } - .onFailure { onResult(it.message ?: "登录失败") } + repository.login(username, password) + .onSuccess { token -> + apiClient.token = token + tokenStore.saveLogin(token, username, baseUrl) + _baseUrl.value = baseUrl + _username.value = username + _authNotice.value = null + _loggedIn.value = true + session.reconcile() + onResult(null) + } + .onFailure { onResult(it.message ?: "登录失败") } + } finally { + authInFlight = false + } } } @@ -121,8 +136,10 @@ class AppContainer(private val app: Application) { /** * 保存 API 地址:合法才写入,不合法把错误文案回给界面(由界面弹提示)。 + * 在途时忽略重复调用。 */ fun updateBaseUrl(url: String, onResult: (String?) -> Unit) { + if (baseUrlSaving) return val value = url.trim() if (value.isBlank()) { onResult("API 地址不能为空") @@ -132,10 +149,15 @@ class AppContainer(private val app: Application) { onResult("API 地址不合法,需要形如 https://host/api") return } + baseUrlSaving = true scope.launch { - tokenStore.saveBaseUrl(value) - _baseUrl.value = value - onResult(null) + try { + tokenStore.saveBaseUrl(value) + _baseUrl.value = value + onResult(null) + } finally { + baseUrlSaving = false + } } } } diff --git a/app/src/main/java/com/catshark/lpt/MainActivity.kt b/app/src/main/java/com/catshark/lpt/MainActivity.kt index 3aad30e..befcbbb 100644 --- a/app/src/main/java/com/catshark/lpt/MainActivity.kt +++ b/app/src/main/java/com/catshark/lpt/MainActivity.kt @@ -103,7 +103,13 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState?>(null) } fun toast(message: String, long: Boolean = false) { + val now = System.currentTimeMillis() + val previous = lastToast.get() + if (previous != null && previous.first == message && now - previous.second < 1_500) return + lastToast.set(message to now) scope.launch { snackbarHostState.showSnackbar( message = message,