diff --git a/README.md b/README.md index efeddfc..5a7cda3 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ LPT 的学习计时原本只能在电脑浏览器里进行;而真实的学习 | 模块 | 内容 | |------|------| -| 登录 | `POST /login` 拿 token,DataStore 持久化,OkHttp 拦截器注入 `satoken` 请求头 | +| 登录 | `POST /login` 拿 token,DataStore 持久化,OkHttp 拦截器注入 `satoken` 请求头;服务端返回 401 时自动退出登录并在登录页说明原因 | | 权限引导 | 悬浮窗权限 / 通知权限 / 电池优化白名单 / MIUI 自启动与后台弹出 | -| 任务列表 | `GET /tasks`,每个任务带「报告」入口 | +| 任务列表 | `GET /tasks`,每个任务带「报告」入口;有进行中的会话时顶部带「回到会话」入口 | | 学习会话 | 开始/继续、暂停、结束、误操作结束(零数据)、学习预期(必填)、知识碎片、结束报告三段 | | 会话冲突出口 | 开始新任务前先查其他任务上的未结束会话,给出「前往继续 / 结束它并开始 / 放弃它」三个出口 | | 悬浮窗 | 前台服务(`specialUse`)托管,跨应用常驻;**只做三件事**:展示倒计时 / 记一条碎片 / 暂停继续 | @@ -125,7 +125,7 @@ app/src/main/java/com/catshark/lpt/ ## 已知限制 -- 浮窗依赖悬浮窗权限;进程被杀后靠 `START_STICKY` + 启动时对账恢复,被系统彻底禁止后台启动时(部分国内 ROM)仍需用户手动打开一次 App。 +- 浮窗依赖悬浮窗权限;进程被杀后靠 `START_STICKY` + 启动时对账恢复。实测 **MIUI(Android 12)不会重启被杀的进程**:进程没了浮窗就没了,需要用户打开一次 App 才恢复(打开后的对账是可靠的)。 - 国内 OEM 的省电策略可能杀掉前台服务,需要用户手动白名单。 - 报告第四部分「按归属分组的碎片」由复习模块实时聚合,本客户端按仓库边界不访问复习端点,报告页只列本次会话产生的碎片。 - 没有自动化测试;`.gitea/workflows/build.yml` 只构建不跑测试。 diff --git a/app/src/main/java/com/catshark/lpt/LptApp.kt b/app/src/main/java/com/catshark/lpt/LptApp.kt index 1ced0c0..e75b4b6 100644 --- a/app/src/main/java/com/catshark/lpt/LptApp.kt +++ b/app/src/main/java/com/catshark/lpt/LptApp.kt @@ -4,6 +4,7 @@ import android.app.Application import com.catshark.lpt.data.ApiClient import com.catshark.lpt.data.LptRepository import com.catshark.lpt.data.TokenStore +import com.catshark.lpt.service.StudySessionService import com.catshark.lpt.session.SessionController import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -45,7 +46,12 @@ class AppContainer(private val app: Application) { private val _baseUrl = MutableStateFlow(ApiClient.DEFAULT_BASE_URL) val baseUrl: StateFlow = _baseUrl.asStateFlow() + /** 登录页要展示的一次性提示(比如 token 失效),登录成功后清除 */ + private val _authNotice = MutableStateFlow(null) + val authNotice: StateFlow = _authNotice.asStateFlow() + init { + apiClient.onUnauthorized = { expireLogin() } scope.launch { val settings = tokenStore.load() apiClient.setBaseUrl(settings.baseUrl) @@ -72,6 +78,7 @@ class AppContainer(private val app: Application) { tokenStore.saveLogin(token, username, baseUrl) _baseUrl.value = baseUrl _username.value = username + _authNotice.value = null _loggedIn.value = true session.reconcile() onResult(null) @@ -83,14 +90,31 @@ class AppContainer(private val app: Application) { fun logout() { scope.launch { repository.logout() - tokenStore.clearLogin() - apiClient.token = null - session.clear() - _loggedIn.value = false - session.markResolved() + clearLoginState() } } + /** + * token 失效:本地直接退出登录并回登录页。 + * 不调 /logout(这个 token 已经无效了),也不再发请求,避免递归。 + */ + private fun expireLogin() { + if (!_loggedIn.value) return + scope.launch { + _authNotice.value = "登录已失效,请重新登录" + StudySessionService.stop(app) + clearLoginState() + } + } + + private suspend fun clearLoginState() { + tokenStore.clearLogin() + apiClient.token = null + session.clear() + session.markResolved() + _loggedIn.value = false + } + fun updateBaseUrl(url: String) { scope.launch { apiClient.setBaseUrl(url) diff --git a/app/src/main/java/com/catshark/lpt/MainActivity.kt b/app/src/main/java/com/catshark/lpt/MainActivity.kt index 5536243..c7c302d 100644 --- a/app/src/main/java/com/catshark/lpt/MainActivity.kt +++ b/app/src/main/java/com/catshark/lpt/MainActivity.kt @@ -89,6 +89,7 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState + ErrorBar(message = message, onDismiss = { container.session.consumeError() }) + } + } + + Box(modifier = Modifier.weight(1f)) { + when { !ready -> LoadingScreen() - !loggedIn -> LoginScreen(initialBaseUrl = baseUrl) { user, password, url, onResult -> + !loggedIn -> LoginScreen( + initialBaseUrl = baseUrl, + notice = authNotice, + ) { user, password, url, onResult -> container.login(user, password, url, onResult) } @@ -162,6 +175,8 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState - container.session.resolveConflict(action) { StudySessionService.start(context) } + // 处理完必须显式回到会话页:hasSession 一直是 true,靠状态变化不会触发导航 + container.session.resolveConflict(action) { + StudySessionService.start(context) + screen = Screen.Session + } }, onDismiss = { container.session.dismissConflict() }, ) } - - // 不在会话页时,会话层的失败也要让用户看到 - if (screen != Screen.Session) { - sessionState.error?.let { message -> - ErrorBar(message = message, onDismiss = { container.session.consumeError() }) - } - } } } diff --git a/app/src/main/java/com/catshark/lpt/data/ApiClient.kt b/app/src/main/java/com/catshark/lpt/data/ApiClient.kt index abbaea2..c6c58e4 100644 --- a/app/src/main/java/com/catshark/lpt/data/ApiClient.kt +++ b/app/src/main/java/com/catshark/lpt/data/ApiClient.kt @@ -16,6 +16,10 @@ class ApiClient { @Volatile var token: String? = null + /** 服务端返回 401(token 失效)时的回调,由 AppContainer 接管成“退出登录” */ + @Volatile + var onUnauthorized: (() -> Unit)? = null + @Volatile private var baseUrl: String? = null @@ -32,7 +36,10 @@ class ApiClient { .addInterceptor { chain -> val builder = chain.request().newBuilder() token?.takeIf { it.isNotBlank() }?.let { builder.header("satoken", it) } - chain.proceed(builder.build()) + val response = chain.proceed(builder.build()) + // token 失效:登录接口本身的 401 由登录页自己处理,这里只处理已登录后的失效 + if (response.code == 401) onUnauthorized?.invoke() + response } .connectTimeout(20, TimeUnit.SECONDS) .readTimeout(300, TimeUnit.SECONDS) diff --git a/app/src/main/java/com/catshark/lpt/data/LptRepository.kt b/app/src/main/java/com/catshark/lpt/data/LptRepository.kt index 1456a4f..503e856 100644 --- a/app/src/main/java/com/catshark/lpt/data/LptRepository.kt +++ b/app/src/main/java/com/catshark/lpt/data/LptRepository.kt @@ -19,27 +19,40 @@ class LptRepository(private val apiClient: ApiClient) { return env.data as T } + /** 统一的请求包装:网络/HTTP 层错误都换成用户看得懂的话 */ + private inline fun call(block: () -> T): Result = runCatching(block).friendly() + /** - * 把 HTTP 层错误换成用户看得懂的话。 - * 部署环境的 dev 后端比源码旧,新加的接口在它上面会是 404/405,这类失败要说清楚。 + * 把网络/HTTP 层错误换成用户看得懂的话。 + * 部署环境的 dev 后端可能比源码旧,新加的接口在它上面会是 404/405,这类失败要说清楚。 */ - private fun Result.friendly(action: String): Result { + private fun Result.friendly(action: String? = null): Result { val error = exceptionOrNull() - return if (error is HttpException) { - Result.failure(ApiException("$action 不可用(HTTP ${error.code()}),当前后端可能还没上这个接口")) - } else { - this + return when { + error is HttpException -> { + val detail = "HTTP ${error.code()}" + val message = if (action != null) { + "$action 不可用($detail),当前后端可能还没上这个接口" + } else { + "请求失败($detail),请稍后重试" + } + Result.failure(ApiException(message)) + } + + error is java.io.IOException -> Result.failure(ApiException("网络不可用,请检查网络或设置里的 API 地址")) + + else -> this } } - suspend fun login(username: String, password: String): Result = runCatching { + suspend fun login(username: String, password: String): Result = call { val env = api.login(LoginRequest(username, password)) if (env.code != 200) throw ApiException(env.message?.takeIf { it.isNotBlank() } ?: "登录失败") extractToken(env.data)?.takeIf { it.isNotBlank() } ?: throw ApiException("登录响应缺少 token") } - suspend fun logout(): Result = runCatching { api.logout() } + suspend fun logout(): Result = call { api.logout() } - suspend fun tasks(): Result> = runCatching { + suspend fun tasks(): Result> = call { envelope(api.tasks(), "获取任务").records } @@ -49,41 +62,41 @@ class LptRepository(private val apiClient: ApiClient) { * - 传入 `excludeTaskNum` 时,属于该任务的会话不算冲突(后端直接返回 null); * - 业务失败(code != 200)与网络异常一律上抛:调用方需要区分「确实没有会话」和「没问到」。 */ - suspend fun activeSession(excludeTaskNum: String? = null): Result = runCatching { + suspend fun activeSession(excludeTaskNum: String? = null): Result = call { val env = api.activeSession(excludeTaskNum) if (env.code != 200) throw ApiException(env.message?.takeIf { it.isNotBlank() } ?: "查询未结束会话失败") env.data?.takeIf { it.sessionNum.isNotBlank() } } - suspend fun startOrContinue(taskNum: String): Result = runCatching { + suspend fun startOrContinue(taskNum: String): Result = call { envelope(api.startOrContinue(taskNum), "开始学习会话") } - suspend fun sessionDetail(sessionNum: String): Result = runCatching { + suspend fun sessionDetail(sessionNum: String): Result = call { envelope(api.sessionDetail(sessionNum), "获取会话") } - suspend fun getExpectation(sessionNum: String): Result = runCatching { + suspend fun getExpectation(sessionNum: String): Result = call { api.getExpectation(sessionNum).takeIf { it.code == 200 }?.data?.description.orEmpty() } - suspend fun putExpectation(sessionNum: String, description: String): Result = runCatching { + suspend fun putExpectation(sessionNum: String, description: String): Result = call { envelope(api.putExpectation(sessionNum, ExpectationRequest(description)), "保存学习预期") Unit } - suspend fun continueSession(sessionNum: String): Result = runCatching { + suspend fun continueSession(sessionNum: String): Result = call { envelope(api.continueSession(sessionNum), "继续学习会话") Unit } - suspend fun pauseSession(sessionNum: String): Result = runCatching { + suspend fun pauseSession(sessionNum: String): Result = call { envelope(api.pauseSession(sessionNum), "暂停学习会话") Unit } /** 结束会话;后端可能返回一条提示(如有效时间不足),作为 message 带回 */ - suspend fun endSession(sessionNum: String, sections: ReportSections): Result = runCatching { + suspend fun endSession(sessionNum: String, sections: ReportSections): Result = call { val env = api.endSession( sessionNum, EndSessionRequest( @@ -97,12 +110,12 @@ class LptRepository(private val apiClient: ApiClient) { env.message } - suspend fun abortSession(sessionNum: String, confirmation: String): Result = runCatching { + suspend fun abortSession(sessionNum: String, confirmation: String): Result = call { envelope(api.abortSession(sessionNum, AbortRequest(confirmation)), "误操作结束") Unit } - suspend fun createFragment(sessionNum: String, content: String): Result = runCatching { + suspend fun createFragment(sessionNum: String, content: String): Result = call { envelope( api.createFragment(CreateFragmentRequest(contextNum = sessionNum, sessionNum = sessionNum, content = content)), "记录碎片", @@ -110,7 +123,7 @@ class LptRepository(private val apiClient: ApiClient) { Unit } - suspend fun fragments(sessionNum: String): Result> = runCatching { + suspend fun fragments(sessionNum: String): Result> = call { api.fragmentsBySession(sessionNum).takeIf { it.code == 200 }?.data.orEmpty() } diff --git a/app/src/main/java/com/catshark/lpt/ui/LoginScreen.kt b/app/src/main/java/com/catshark/lpt/ui/LoginScreen.kt index d9376f8..ae985a3 100644 --- a/app/src/main/java/com/catshark/lpt/ui/LoginScreen.kt +++ b/app/src/main/java/com/catshark/lpt/ui/LoginScreen.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.unit.dp @Composable fun LoginScreen( initialBaseUrl: String, + notice: String? = null, onLogin: (username: String, password: String, baseUrl: String, onResult: (String?) -> Unit) -> Unit, ) { var username by remember { mutableStateOf("") } @@ -55,6 +56,16 @@ fun LoginScreen( ) Spacer(Modifier.height(24.dp)) + if (notice != null) { + // 一直留到下次登录成功:否则用户回到登录页时已经看不到原因了 + Text( + notice, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + ) + Spacer(Modifier.height(8.dp)) + } + OutlinedTextField( value = username, onValueChange = { username = it }, diff --git a/app/src/main/java/com/catshark/lpt/ui/SessionScreen.kt b/app/src/main/java/com/catshark/lpt/ui/SessionScreen.kt index cafe2bb..8eab2b8 100644 --- a/app/src/main/java/com/catshark/lpt/ui/SessionScreen.kt +++ b/app/src/main/java/com/catshark/lpt/ui/SessionScreen.kt @@ -374,7 +374,8 @@ private fun EndSessionDialog( fun currentSections(): ReportSections = ReportSections(summary, verdict, free) LaunchedEffect(Unit) { - if (currentSections().allBlank && hasFragments) onGenerateDraft() + // 已经有缓存草稿时直接用它,不要为了重开弹窗再化一次 AI + if (currentSections().allBlank && hasFragments && state.draft == null) onGenerateDraft() } // 草稿是整段覆盖的:它就是这次生成的编辑起点 LaunchedEffect(state.draft) { diff --git a/app/src/main/java/com/catshark/lpt/ui/TaskListScreen.kt b/app/src/main/java/com/catshark/lpt/ui/TaskListScreen.kt index ab334c6..e0a0c1a 100644 --- a/app/src/main/java/com/catshark/lpt/ui/TaskListScreen.kt +++ b/app/src/main/java/com/catshark/lpt/ui/TaskListScreen.kt @@ -33,6 +33,8 @@ fun TaskListScreen( onRefresh: () -> Unit, onStart: (TaskItem) -> Unit, onOpenReports: (TaskItem) -> Unit, + hasActiveSession: Boolean, + onOpenSession: () -> Unit, onOpenSettings: () -> Unit, onOpenPermissions: () -> Unit, onLogout: () -> Unit, @@ -56,6 +58,33 @@ fun TaskListScreen( TextButton(onClick = onOpenSettings) { Text("设置") } } + if (hasActiveSession) { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 4.dp) + .clickable { onOpenSession() }, + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 14.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + "有一次学习正在进行", + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.weight(1f), + ) + Text( + "回到会话 ›", + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.primary, + ) + } + } + } + if (error != null) { Row( modifier = Modifier