feat: 补齐会话冲突出口、预期必填与报告闭环,精简悬浮窗
- 会话冲突出口:开始新任务前查其他任务上的未结束会话,给出「前往继续 / 结束它并开始 / 放弃它」三个出口,避免同时存在两个进行中的会话 - 学习预期必填:未填预期时用不可关闭弹窗挡住,只能保存预期或走误操作结束 - 收敛提示:把服务端 systemMessage / autoConverged 原样告知用户 - 学习报告:结束会话时取 REPORT_DRAFT 草稿(AI 不可用由后端规则降级)作为编辑起点,可直接手写结束;任务页新增报告查看(三段 + 本会话碎片) - 悬浮窗只保留三件事:展示倒计时、记一条碎片、暂停/继续;结束、报告、预期等一律回到 App 页面 - 修复前台服务在进程被系统拉起时把「还不知道」当成「没有会话」而自杀(以 State.resolved 为准)
This commit is contained in:
@@ -5,12 +5,21 @@ import android.os.Bundle
|
||||
import android.provider.Settings
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedButton
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.collectAsState
|
||||
@@ -22,10 +31,13 @@ import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.catshark.lpt.data.TaskItem
|
||||
import com.catshark.lpt.service.StudySessionService
|
||||
import com.catshark.lpt.session.SessionController
|
||||
import com.catshark.lpt.ui.LoginScreen
|
||||
import com.catshark.lpt.ui.PermissionScreen
|
||||
import com.catshark.lpt.ui.ReportsScreen
|
||||
import com.catshark.lpt.ui.SessionScreen
|
||||
import com.catshark.lpt.ui.SettingsScreen
|
||||
import com.catshark.lpt.ui.TaskListScreen
|
||||
@@ -64,7 +76,7 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
private enum class Screen { Tasks, Session, Permissions, Settings }
|
||||
private enum class Screen { Tasks, Session, Reports, Permissions, Settings }
|
||||
|
||||
@Composable
|
||||
private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState<Boolean>) {
|
||||
@@ -83,6 +95,7 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState<Boolea
|
||||
var tasks by remember { mutableStateOf<List<TaskItem>>(emptyList()) }
|
||||
var tasksLoading by remember { mutableStateOf(false) }
|
||||
var tasksError by remember { mutableStateOf<String?>(null) }
|
||||
var reportTask by remember { mutableStateOf<TaskItem?>(null) }
|
||||
|
||||
fun refreshTasks() {
|
||||
tasksLoading = true
|
||||
@@ -125,73 +138,213 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState<Boolea
|
||||
}
|
||||
}
|
||||
|
||||
when {
|
||||
!ready -> LoadingScreen()
|
||||
Box(modifier = Modifier.fillMaxSize()) {
|
||||
when {
|
||||
!ready -> LoadingScreen()
|
||||
|
||||
!loggedIn -> LoginScreen(initialBaseUrl = baseUrl) { user, password, url, onResult ->
|
||||
container.login(user, password, url, onResult)
|
||||
!loggedIn -> LoginScreen(initialBaseUrl = baseUrl) { user, password, url, onResult ->
|
||||
container.login(user, password, url, onResult)
|
||||
}
|
||||
|
||||
else -> when (screen) {
|
||||
Screen.Tasks -> TaskListScreen(
|
||||
tasks = tasks,
|
||||
loading = tasksLoading,
|
||||
error = tasksError,
|
||||
username = username,
|
||||
onRefresh = { refreshTasks() },
|
||||
onStart = { task ->
|
||||
container.session.startOrContinue(task.taskNum) {
|
||||
StudySessionService.start(context)
|
||||
}
|
||||
},
|
||||
onOpenReports = { task ->
|
||||
reportTask = task
|
||||
screen = Screen.Reports
|
||||
},
|
||||
onOpenSettings = { screen = Screen.Settings },
|
||||
onOpenPermissions = { screen = Screen.Permissions },
|
||||
onLogout = {
|
||||
StudySessionService.stop(context)
|
||||
container.logout()
|
||||
},
|
||||
)
|
||||
|
||||
Screen.Session -> SessionScreen(
|
||||
state = sessionState,
|
||||
openEndDialog = openEnd,
|
||||
onConsumeOpenEnd = { openEndRequest.value = false },
|
||||
onTogglePause = {
|
||||
if (sessionState.status == SessionController.Status.ONGOING) {
|
||||
container.session.pause()
|
||||
} else {
|
||||
container.session.resume()
|
||||
}
|
||||
},
|
||||
onEnd = { sections ->
|
||||
container.session.end(sections) {
|
||||
StudySessionService.stop(context)
|
||||
refreshTasks()
|
||||
}
|
||||
},
|
||||
onAbort = { phrase ->
|
||||
container.session.abort(phrase) {
|
||||
StudySessionService.stop(context)
|
||||
refreshTasks()
|
||||
}
|
||||
},
|
||||
onSaveExpectation = { container.session.saveExpectation(it) },
|
||||
onAddFragment = { container.session.addFragment(it) },
|
||||
onShowOverlay = { StudySessionService.showOverlay(context) },
|
||||
onGenerateDraft = { container.session.generateReportDraft() },
|
||||
onBack = { screen = Screen.Tasks },
|
||||
)
|
||||
|
||||
Screen.Reports -> {
|
||||
val task = reportTask
|
||||
if (task == null) {
|
||||
LaunchedEffect(Unit) { screen = Screen.Tasks }
|
||||
} else {
|
||||
ReportsScreen(
|
||||
taskName = task.taskName,
|
||||
onLoadReports = { page -> container.repository.reports(task.taskNum, page) },
|
||||
onLoadFragments = { sessionNum -> container.repository.allFragments(sessionNum) },
|
||||
onBack = { screen = Screen.Tasks },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Screen.Permissions -> PermissionScreen(onBack = { screen = Screen.Tasks })
|
||||
|
||||
Screen.Settings -> SettingsScreen(
|
||||
baseUrl = baseUrl,
|
||||
onSave = { container.updateBaseUrl(it) },
|
||||
onLogout = {
|
||||
StudySessionService.stop(context)
|
||||
container.logout()
|
||||
},
|
||||
onBack = { screen = Screen.Tasks },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
else -> when (screen) {
|
||||
Screen.Tasks -> TaskListScreen(
|
||||
tasks = tasks,
|
||||
loading = tasksLoading,
|
||||
error = tasksError,
|
||||
username = username,
|
||||
onRefresh = { refreshTasks() },
|
||||
onStart = { task ->
|
||||
container.session.startOrContinue(task.taskNum) {
|
||||
StudySessionService.start(context)
|
||||
}
|
||||
},
|
||||
onOpenSettings = { screen = Screen.Settings },
|
||||
onOpenPermissions = { screen = Screen.Permissions },
|
||||
onLogout = {
|
||||
StudySessionService.stop(context)
|
||||
container.logout()
|
||||
},
|
||||
)
|
||||
|
||||
Screen.Session -> SessionScreen(
|
||||
// 会话-05:别的任务上还有未结束会话时,先让用户选出口
|
||||
sessionState.conflict?.let {
|
||||
SessionConflictDialog(
|
||||
state = sessionState,
|
||||
openEndDialog = openEnd,
|
||||
onConsumeOpenEnd = { openEndRequest.value = false },
|
||||
onTogglePause = {
|
||||
if (sessionState.status == com.catshark.lpt.session.SessionController.Status.ONGOING) {
|
||||
container.session.pause()
|
||||
} else {
|
||||
container.session.resume()
|
||||
}
|
||||
onAction = { action ->
|
||||
container.session.resolveConflict(action) { StudySessionService.start(context) }
|
||||
},
|
||||
onEnd = { sections ->
|
||||
container.session.end(sections) {
|
||||
StudySessionService.stop(context)
|
||||
refreshTasks()
|
||||
}
|
||||
},
|
||||
onAbort = { phrase ->
|
||||
container.session.abort(phrase) {
|
||||
StudySessionService.stop(context)
|
||||
refreshTasks()
|
||||
}
|
||||
},
|
||||
onSaveExpectation = { container.session.saveExpectation(it) },
|
||||
onAddFragment = { container.session.addFragment(it) },
|
||||
onShowOverlay = { StudySessionService.showOverlay(context) },
|
||||
onBack = { screen = Screen.Tasks },
|
||||
onDismiss = { container.session.dismissConflict() },
|
||||
)
|
||||
}
|
||||
|
||||
Screen.Permissions -> PermissionScreen(onBack = { screen = Screen.Tasks })
|
||||
// 不在会话页时,会话层的失败也要让用户看到
|
||||
if (screen != Screen.Session) {
|
||||
sessionState.error?.let { message ->
|
||||
ErrorBar(message = message, onDismiss = { container.session.consumeError() })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Screen.Settings -> SettingsScreen(
|
||||
baseUrl = baseUrl,
|
||||
onSave = { container.updateBaseUrl(it) },
|
||||
onLogout = {
|
||||
StudySessionService.stop(context)
|
||||
container.logout()
|
||||
},
|
||||
onBack = { screen = Screen.Tasks },
|
||||
/**
|
||||
* 会话-05 的出口选择弹窗:不能直接开始新任务,必须先说清旧会话怎么办。
|
||||
* 三个出口对应 lpt-docs「离开一个未结束的会话」:前往继续 / 结束它并开始 / 放弃它。
|
||||
*/
|
||||
@Composable
|
||||
private fun SessionConflictDialog(
|
||||
state: SessionController.State,
|
||||
onAction: (SessionController.ConflictAction) -> Unit,
|
||||
onDismiss: () -> Unit,
|
||||
) {
|
||||
val conflict = state.conflict ?: return
|
||||
val busy = state.conflictBusy
|
||||
AlertDialog(
|
||||
onDismissRequest = { if (busy == null) onDismiss() },
|
||||
title = { Text("还有未结束的学习会话") },
|
||||
text = {
|
||||
Column {
|
||||
Text(
|
||||
"你已经有一个未结束的学习会话:「${conflict.taskName ?: conflict.taskNum}」",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
Text(
|
||||
conflict.sessionNum,
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
if (conflict.autoConverged) {
|
||||
Text(
|
||||
conflict.systemMessage ?: "这个会话看起来是忘记结束了,服务端已按一个番茄钟自动截止。",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.secondary,
|
||||
)
|
||||
}
|
||||
Text(
|
||||
"可以直接开始当前任务:开始时会先把上面这个会话结束(会生成一份未填总结的学习报告);" +
|
||||
"如果它本来就是误操作开启的,可以选择放弃,不会留下任何记录。",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
if (busy != null) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
CircularProgressIndicator(modifier = Modifier.padding(end = 8.dp), strokeWidth = 2.dp)
|
||||
Text("正在处理上一个会话…", style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
}
|
||||
state.conflictError?.let {
|
||||
Text(it, color = MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodySmall)
|
||||
}
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
Column(modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
Button(
|
||||
onClick = { onAction(SessionController.ConflictAction.CONTINUE) },
|
||||
enabled = busy == null,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("前往继续") }
|
||||
OutlinedButton(
|
||||
onClick = { onAction(SessionController.ConflictAction.END_AND_START) },
|
||||
enabled = busy == null,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("结束它并开始新任务") }
|
||||
OutlinedButton(
|
||||
onClick = { onAction(SessionController.ConflictAction.ABORT) },
|
||||
enabled = busy == null,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("放弃该会话(零数据)") }
|
||||
TextButton(
|
||||
onClick = onDismiss,
|
||||
enabled = busy == null,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) { Text("取消") }
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun ErrorBar(message: String, onDismiss: () -> Unit) {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.errorContainer,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(12.dp),
|
||||
shape = MaterialTheme.shapes.medium,
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Text(
|
||||
message,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onErrorContainer,
|
||||
modifier = Modifier.weight(1f),
|
||||
)
|
||||
TextButton(onClick = onDismiss) { Text("关闭") }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user