Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4de7ac5203 | ||
|
|
17fb0fe3f2 |
@@ -113,6 +113,12 @@ jobs:
|
|||||||
SHA: ${{ gitea.sha }}
|
SHA: ${{ gitea.sha }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
# runner 上只有 coreutils / grep / curl:不得依赖 python3、jq、node
|
||||||
|
# (历史上这三个都缺过:JS action 报 node,本步曾报 python3)
|
||||||
|
for t in curl grep cut head sed mktemp; do
|
||||||
|
command -v "$t" > /dev/null || { echo "ERROR: runner 缺少命令 $t"; exit 1; }
|
||||||
|
done
|
||||||
if [ -z "${TOKEN:-}" ]; then
|
if [ -z "${TOKEN:-}" ]; then
|
||||||
echo "ERROR: GITEA_TOKEN 为空——本步骤依赖 Gitea 为每个 job 自动注入的仓库令牌"
|
echo "ERROR: GITEA_TOKEN 为空——本步骤依赖 Gitea 为每个 job 自动注入的仓库令牌"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -127,26 +133,50 @@ jobs:
|
|||||||
test -f "$APK"
|
test -f "$APK"
|
||||||
AUTH=(-H "Authorization: token ${TOKEN}")
|
AUTH=(-H "Authorization: token ${TOKEN}")
|
||||||
|
|
||||||
# 1) 找滚动 release;不存在就创建(tag 不存在时 Gitea 会按 target_commitish 建)
|
# 纯 shell 取 JSON 字段(不依赖 python3/jq)。
|
||||||
RID="$(curl -sS "${AUTH[@]}" "$API/releases/tags/$TAG" \
|
# 正则对空白宽容(Gitea 默认是紧凑 JSON,但保留容错以便任何重编码都不影响)。
|
||||||
| python3 -c 'import sys,json;print(json.load(sys.stdin).get("id",""))' 2>/dev/null || true)"
|
# 找不到时返回空(`|| true`),否则 set -e 会直接中断。
|
||||||
|
name_re() { printf '%s' "$1" | sed 's/[.[\*^$()+?{}|]/\\&/g'; }
|
||||||
|
first_id() { grep -oE '"id"[[:space:]]*:[[:space:]]*[0-9]+' | head -1 | grep -oE '[0-9]+' | head -1 || true; }
|
||||||
|
asset_id() {
|
||||||
|
grep -oE '\{[[:space:]]*"id"[[:space:]]*:[[:space:]]*[0-9]+[[:space:]]*,[[:space:]]*"name"[[:space:]]*:[[:space:]]*"[^"]*"' \
|
||||||
|
| grep -E "\"name\"[[:space:]]*:[[:space:]]*\"$(name_re "$1")\"" \
|
||||||
|
| head -1 \
|
||||||
|
| sed -E 's/^\{[[:space:]]*"id"[[:space:]]*:[[:space:]]*([0-9]+).*/\1/' || true
|
||||||
|
}
|
||||||
|
|
||||||
|
# 1) 找滚动 release(看状态码而不是解析错误体);不存在就创建
|
||||||
|
REL_JSON="$(mktemp)"
|
||||||
|
CODE="$(curl -sS -o "$REL_JSON" -w '%{http_code}' "${AUTH[@]}" "$API/releases/tags/$TAG")"
|
||||||
|
echo "查 $TAG: HTTP $CODE"
|
||||||
|
if [ "$CODE" = "200" ]; then
|
||||||
|
RID="$(cat "$REL_JSON" | first_id)"
|
||||||
|
else
|
||||||
|
RID=""
|
||||||
|
fi
|
||||||
if [ -z "$RID" ]; then
|
if [ -z "$RID" ]; then
|
||||||
echo "创建滚动 release: $TAG(分支 $BRANCH)"
|
echo "创建滚动 release: $TAG(分支 $BRANCH)"
|
||||||
RID="$(curl -fsS "${AUTH[@]}" -H 'Content-Type: application/json' -X POST "$API/releases" \
|
curl -fsS "${AUTH[@]}" -H 'Content-Type: application/json' -X POST "$API/releases" \
|
||||||
-d "{\"tag_name\":\"$TAG\",\"target_commitish\":\"$BRANCH\",\"name\":\"LPT Android ${ENV_NAME}(滚动发布)\",\"body\":\"附件始终是该环境最新一次构建,每次覆盖;sha256 见对应构建日志。\"}" \
|
-d "{\"tag_name\":\"$TAG\",\"target_commitish\":\"$BRANCH\",\"name\":\"LPT Android ${ENV_NAME}(滚动发布)\",\"body\":\"附件始终是该环境最新一次构建,每次覆盖;sha256 见对应构建日志。\"}" \
|
||||||
| python3 -c 'import sys,json;print(json.load(sys.stdin)["id"])')"
|
-o "$REL_JSON"
|
||||||
|
RID="$(cat "$REL_JSON" | first_id)"
|
||||||
|
if [ -z "$RID" ]; then
|
||||||
|
echo "ERROR: 创建 release 后拿不到 id,响应前 300 字节:"
|
||||||
|
head -c 300 "$REL_JSON"; echo
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
echo "release id=$RID"
|
echo "release id=$RID"
|
||||||
|
|
||||||
# 2) 同名附件先删,保证下载链接稳定
|
# 2) 同名附件先删,保证下载链接稳定
|
||||||
ASSETS_JSON="$(mktemp)"
|
ASSETS_JSON="$(mktemp)"
|
||||||
for NAME in "$ASSET" "${ASSET}.sha256"; do
|
|
||||||
curl -fsS "${AUTH[@]}" "$API/releases/$RID/assets" -o "$ASSETS_JSON"
|
curl -fsS "${AUTH[@]}" "$API/releases/$RID/assets" -o "$ASSETS_JSON"
|
||||||
OLD_IDS="$(ASSET_NAME="$NAME" python3 -c 'import json,os,sys;print("\n".join(str(a["id"]) for a in json.load(open(sys.argv[1])) if a["name"]==os.environ["ASSET_NAME"]))' "$ASSETS_JSON")"
|
for NAME in "$ASSET" "${ASSET}.sha256"; do
|
||||||
for AID in $OLD_IDS; do
|
AID="$(cat "$ASSETS_JSON" | asset_id "$NAME")"
|
||||||
|
if [ -n "$AID" ]; then
|
||||||
echo "删除旧附件 $NAME (id=$AID)"
|
echo "删除旧附件 $NAME (id=$AID)"
|
||||||
curl -fsS "${AUTH[@]}" -X DELETE "$API/releases/assets/$AID" > /dev/null
|
curl -fsS "${AUTH[@]}" -X DELETE "$API/releases/assets/$AID" > /dev/null
|
||||||
done
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# 3) 上传新附件
|
# 3) 上传新附件
|
||||||
@@ -155,5 +185,20 @@ jobs:
|
|||||||
curl -fsS "${AUTH[@]}" -X POST "$API/releases/$RID/assets?name=${ASSET}.sha256" \
|
curl -fsS "${AUTH[@]}" -X POST "$API/releases/$RID/assets?name=${ASSET}.sha256" \
|
||||||
-F "attachment=@apk-sha256.txt" > /dev/null
|
-F "attachment=@apk-sha256.txt" > /dev/null
|
||||||
|
|
||||||
|
# 4) 回读校验:两个附件名都能在 release 上找到(不依赖任何外部工具)
|
||||||
|
curl -fsS "${AUTH[@]}" "$API/releases/$RID/assets" -o "$ASSETS_JSON"
|
||||||
|
MISSING=0
|
||||||
|
for NAME in "$ASSET" "${ASSET}.sha256"; do
|
||||||
|
if grep -qE "\"name\"[[:space:]]*:[[:space:]]*\"$(name_re "$NAME")\"" "$ASSETS_JSON"; then
|
||||||
|
echo "OK: 已上传 $NAME"
|
||||||
|
else
|
||||||
|
echo "ERROR: 附件 $NAME 上传后读不到"; MISSING=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ "$MISSING" != "0" ]; then
|
||||||
|
echo "release 附件列表响应:"; head -c 500 "$ASSETS_JSON"; echo
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo "OK: https://git.cat-shark.xyz/cat-shark/lpt-android/releases/tag/$TAG"
|
echo "OK: https://git.cat-shark.xyz/cat-shark/lpt-android/releases/tag/$TAG"
|
||||||
echo "附件: $ASSET / ${ASSET}.sha256(本次 sha=${SHORT})"
|
echo "附件: $ASSET / ${ASSET}.sha256(本次 sha=${SHORT})"
|
||||||
|
|||||||
@@ -60,8 +60,8 @@
|
|||||||
3. 容器内构建 APK(`ci/Dockerfile` 固定 JDK 17 / cmdline-tools / android-36),产物上传到该环境的**滚动 Release** 并在日志打印 sha256。
|
3. 容器内构建 APK(`ci/Dockerfile` 固定 JDK 17 / cmdline-tools / android-36),产物上传到该环境的**滚动 Release** 并在日志打印 sha256。
|
||||||
- APK 不入 Git(`.gitignore` 已忽略 `*.apk`),分发走 Release 附件:
|
- APK 不入 Git(`.gitignore` 已忽略 `*.apk`),分发走 Release 附件:
|
||||||
`https://git.cat-shark.xyz/cat-shark/lpt-android/releases/tag/android-dev`(生产为 `android-prod`),每次构建覆盖同名附件。
|
`https://git.cat-shark.xyz/cat-shark/lpt-android/releases/tag/android-dev`(生产为 `android-prod`),每次构建覆盖同名附件。
|
||||||
- **本仓库的流水线不使用任何 `uses:` action**:runner 上没有 `node`,JS action(含 `actions/upload-artifact`)会报 `Cannot find: node in PATH`。
|
- **本仓库的流水线不使用任何 `uses:` action**,也不得依赖 `python3` / `jq`(runner 上都没有,历史报错:`Cannot find: node in PATH`、`python3: command not found`)。
|
||||||
归档改用 Gitea 的 Release API + `curl`,凭据用 Gitea 为每个 job 自动注入的 `secrets.GITEA_TOKEN`(权限由 workflow 的 `permissions: contents: write` 声明)。新增步骤时同样优先纯 shell。
|
归档改用 Gitea 的 Release API + `curl`,只用 `grep`/`sed`/`cut` 解析 JSON,凭据用 Gitea 为每个 job 自动注入的 `secrets.GITEA_TOKEN`(权限由 workflow 的 `permissions: contents: write` 声明)。新增步骤前先确认工具在 runner 上存在(脚本开头有 `command -v` 预检)。
|
||||||
|
|
||||||
## 提交规范
|
## 提交规范
|
||||||
|
|
||||||
|
|||||||
@@ -17,9 +17,9 @@ LPT 的学习计时原本只能在电脑浏览器里进行;而真实的学习
|
|||||||
|
|
||||||
| 模块 | 内容 |
|
| 模块 | 内容 |
|
||||||
|------|------|
|
|------|------|
|
||||||
| 登录 | `POST /login` 拿 token,DataStore 持久化,OkHttp 拦截器注入 `satoken` 请求头 |
|
| 登录 | `POST /login` 拿 token,DataStore 持久化,OkHttp 拦截器注入 `satoken` 请求头;服务端返回 401 时自动退出登录并在登录页说明原因 |
|
||||||
| 权限引导 | 悬浮窗权限 / 通知权限 / 电池优化白名单 / MIUI 自启动与后台弹出 |
|
| 权限引导 | 悬浮窗权限 / 通知权限 / 电池优化白名单 / MIUI 自启动与后台弹出 |
|
||||||
| 任务列表 | `GET /tasks`,每个任务带「报告」入口 |
|
| 任务列表 | `GET /tasks`,每个任务带「报告」入口;有进行中的会话时顶部带「回到会话」入口 |
|
||||||
| 学习会话 | 开始/继续、暂停、结束、误操作结束(零数据)、学习预期(必填)、知识碎片、结束报告三段 |
|
| 学习会话 | 开始/继续、暂停、结束、误操作结束(零数据)、学习预期(必填)、知识碎片、结束报告三段 |
|
||||||
| 会话冲突出口 | 开始新任务前先查其他任务上的未结束会话,给出「前往继续 / 结束它并开始 / 放弃它」三个出口 |
|
| 会话冲突出口 | 开始新任务前先查其他任务上的未结束会话,给出「前往继续 / 结束它并开始 / 放弃它」三个出口 |
|
||||||
| 悬浮窗 | 前台服务(`specialUse`)托管,跨应用常驻;**只做三件事**:展示倒计时 / 记一条碎片 / 暂停继续 |
|
| 悬浮窗 | 前台服务(`specialUse`)托管,跨应用常驻;**只做三件事**:展示倒计时 / 记一条碎片 / 暂停继续 |
|
||||||
@@ -125,7 +125,7 @@ app/src/main/java/com/catshark/lpt/
|
|||||||
|
|
||||||
## 已知限制
|
## 已知限制
|
||||||
|
|
||||||
- 浮窗依赖悬浮窗权限;进程被杀后靠 `START_STICKY` + 启动时对账恢复,被系统彻底禁止后台启动时(部分国内 ROM)仍需用户手动打开一次 App。
|
- 浮窗依赖悬浮窗权限;进程被杀后靠 `START_STICKY` + 启动时对账恢复。实测 **MIUI(Android 12)不会重启被杀的进程**:进程没了浮窗就没了,需要用户打开一次 App 才恢复(打开后的对账是可靠的)。
|
||||||
- 国内 OEM 的省电策略可能杀掉前台服务,需要用户手动白名单。
|
- 国内 OEM 的省电策略可能杀掉前台服务,需要用户手动白名单。
|
||||||
- 报告第四部分「按归属分组的碎片」由复习模块实时聚合,本客户端按仓库边界不访问复习端点,报告页只列本次会话产生的碎片。
|
- 报告第四部分「按归属分组的碎片」由复习模块实时聚合,本客户端按仓库边界不访问复习端点,报告页只列本次会话产生的碎片。
|
||||||
- 没有自动化测试;`.gitea/workflows/build.yml` 只构建不跑测试。
|
- 没有自动化测试;`.gitea/workflows/build.yml` 只构建不跑测试。
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import android.app.Application
|
|||||||
import com.catshark.lpt.data.ApiClient
|
import com.catshark.lpt.data.ApiClient
|
||||||
import com.catshark.lpt.data.LptRepository
|
import com.catshark.lpt.data.LptRepository
|
||||||
import com.catshark.lpt.data.TokenStore
|
import com.catshark.lpt.data.TokenStore
|
||||||
|
import com.catshark.lpt.service.StudySessionService
|
||||||
import com.catshark.lpt.session.SessionController
|
import com.catshark.lpt.session.SessionController
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
@@ -45,7 +46,12 @@ class AppContainer(private val app: Application) {
|
|||||||
private val _baseUrl = MutableStateFlow(ApiClient.DEFAULT_BASE_URL)
|
private val _baseUrl = MutableStateFlow(ApiClient.DEFAULT_BASE_URL)
|
||||||
val baseUrl: StateFlow<String> = _baseUrl.asStateFlow()
|
val baseUrl: StateFlow<String> = _baseUrl.asStateFlow()
|
||||||
|
|
||||||
|
/** 登录页要展示的一次性提示(比如 token 失效),登录成功后清除 */
|
||||||
|
private val _authNotice = MutableStateFlow<String?>(null)
|
||||||
|
val authNotice: StateFlow<String?> = _authNotice.asStateFlow()
|
||||||
|
|
||||||
init {
|
init {
|
||||||
|
apiClient.onUnauthorized = { expireLogin() }
|
||||||
scope.launch {
|
scope.launch {
|
||||||
val settings = tokenStore.load()
|
val settings = tokenStore.load()
|
||||||
apiClient.setBaseUrl(settings.baseUrl)
|
apiClient.setBaseUrl(settings.baseUrl)
|
||||||
@@ -72,6 +78,7 @@ class AppContainer(private val app: Application) {
|
|||||||
tokenStore.saveLogin(token, username, baseUrl)
|
tokenStore.saveLogin(token, username, baseUrl)
|
||||||
_baseUrl.value = baseUrl
|
_baseUrl.value = baseUrl
|
||||||
_username.value = username
|
_username.value = username
|
||||||
|
_authNotice.value = null
|
||||||
_loggedIn.value = true
|
_loggedIn.value = true
|
||||||
session.reconcile()
|
session.reconcile()
|
||||||
onResult(null)
|
onResult(null)
|
||||||
@@ -83,12 +90,29 @@ class AppContainer(private val app: Application) {
|
|||||||
fun logout() {
|
fun logout() {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
repository.logout()
|
repository.logout()
|
||||||
|
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()
|
tokenStore.clearLogin()
|
||||||
apiClient.token = null
|
apiClient.token = null
|
||||||
session.clear()
|
session.clear()
|
||||||
_loggedIn.value = false
|
|
||||||
session.markResolved()
|
session.markResolved()
|
||||||
}
|
_loggedIn.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
fun updateBaseUrl(url: String) {
|
fun updateBaseUrl(url: String) {
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState<Boolea
|
|||||||
val username by container.username.collectAsState()
|
val username by container.username.collectAsState()
|
||||||
val baseUrl by container.baseUrl.collectAsState()
|
val baseUrl by container.baseUrl.collectAsState()
|
||||||
val sessionState by container.session.state.collectAsState()
|
val sessionState by container.session.state.collectAsState()
|
||||||
|
val authNotice by container.authNotice.collectAsState()
|
||||||
val openEnd by openEndRequest
|
val openEnd by openEndRequest
|
||||||
|
|
||||||
var screen by remember { mutableStateOf(Screen.Tasks) }
|
var screen by remember { mutableStateOf(Screen.Tasks) }
|
||||||
@@ -139,10 +140,22 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState<Boolea
|
|||||||
}
|
}
|
||||||
|
|
||||||
Box(modifier = Modifier.fillMaxSize()) {
|
Box(modifier = Modifier.fillMaxSize()) {
|
||||||
|
Column(modifier = Modifier.fillMaxSize()) {
|
||||||
|
// 不在会话页时,会话层的失败也要让用户看到(用正常布局占位,不遮住下面的标题)
|
||||||
|
if (screen != Screen.Session) {
|
||||||
|
sessionState.error?.let { message ->
|
||||||
|
ErrorBar(message = message, onDismiss = { container.session.consumeError() })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Box(modifier = Modifier.weight(1f)) {
|
||||||
when {
|
when {
|
||||||
!ready -> LoadingScreen()
|
!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)
|
container.login(user, password, url, onResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,6 +175,8 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState<Boolea
|
|||||||
reportTask = task
|
reportTask = task
|
||||||
screen = Screen.Reports
|
screen = Screen.Reports
|
||||||
},
|
},
|
||||||
|
hasActiveSession = sessionState.hasSession,
|
||||||
|
onOpenSession = { screen = Screen.Session },
|
||||||
onOpenSettings = { screen = Screen.Settings },
|
onOpenSettings = { screen = Screen.Settings },
|
||||||
onOpenPermissions = { screen = Screen.Permissions },
|
onOpenPermissions = { screen = Screen.Permissions },
|
||||||
onLogout = {
|
onLogout = {
|
||||||
@@ -227,24 +242,23 @@ private fun AppRoot(openEndRequest: androidx.compose.runtime.MutableState<Boolea
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 会话-05:别的任务上还有未结束会话时,先让用户选出口
|
// 会话-05:别的任务上还有未结束会话时,先让用户选出口
|
||||||
sessionState.conflict?.let {
|
sessionState.conflict?.let {
|
||||||
SessionConflictDialog(
|
SessionConflictDialog(
|
||||||
state = sessionState,
|
state = sessionState,
|
||||||
onAction = { action ->
|
onAction = { action ->
|
||||||
container.session.resolveConflict(action) { StudySessionService.start(context) }
|
// 处理完必须显式回到会话页:hasSession 一直是 true,靠状态变化不会触发导航
|
||||||
|
container.session.resolveConflict(action) {
|
||||||
|
StudySessionService.start(context)
|
||||||
|
screen = Screen.Session
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onDismiss = { container.session.dismissConflict() },
|
onDismiss = { container.session.dismissConflict() },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 不在会话页时,会话层的失败也要让用户看到
|
|
||||||
if (screen != Screen.Session) {
|
|
||||||
sessionState.error?.let { message ->
|
|
||||||
ErrorBar(message = message, onDismiss = { container.session.consumeError() })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ class ApiClient {
|
|||||||
@Volatile
|
@Volatile
|
||||||
var token: String? = null
|
var token: String? = null
|
||||||
|
|
||||||
|
/** 服务端返回 401(token 失效)时的回调,由 AppContainer 接管成“退出登录” */
|
||||||
|
@Volatile
|
||||||
|
var onUnauthorized: (() -> Unit)? = null
|
||||||
|
|
||||||
@Volatile
|
@Volatile
|
||||||
private var baseUrl: String? = null
|
private var baseUrl: String? = null
|
||||||
|
|
||||||
@@ -32,7 +36,10 @@ class ApiClient {
|
|||||||
.addInterceptor { chain ->
|
.addInterceptor { chain ->
|
||||||
val builder = chain.request().newBuilder()
|
val builder = chain.request().newBuilder()
|
||||||
token?.takeIf { it.isNotBlank() }?.let { builder.header("satoken", it) }
|
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)
|
.connectTimeout(20, TimeUnit.SECONDS)
|
||||||
.readTimeout(300, TimeUnit.SECONDS)
|
.readTimeout(300, TimeUnit.SECONDS)
|
||||||
|
|||||||
@@ -19,27 +19,40 @@ class LptRepository(private val apiClient: ApiClient) {
|
|||||||
return env.data as T
|
return env.data as T
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 统一的请求包装:网络/HTTP 层错误都换成用户看得懂的话 */
|
||||||
|
private inline fun <T> call(block: () -> T): Result<T> = runCatching(block).friendly()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 把 HTTP 层错误换成用户看得懂的话。
|
* 把网络/HTTP 层错误换成用户看得懂的话。
|
||||||
* 部署环境的 dev 后端比源码旧,新加的接口在它上面会是 404/405,这类失败要说清楚。
|
* 部署环境的 dev 后端可能比源码旧,新加的接口在它上面会是 404/405,这类失败要说清楚。
|
||||||
*/
|
*/
|
||||||
private fun <T> Result<T>.friendly(action: String): Result<T> {
|
private fun <T> Result<T>.friendly(action: String? = null): Result<T> {
|
||||||
val error = exceptionOrNull()
|
val error = exceptionOrNull()
|
||||||
return if (error is HttpException) {
|
return when {
|
||||||
Result.failure(ApiException("$action 不可用(HTTP ${error.code()}),当前后端可能还没上这个接口"))
|
error is HttpException -> {
|
||||||
|
val detail = "HTTP ${error.code()}"
|
||||||
|
val message = if (action != null) {
|
||||||
|
"$action 不可用($detail),当前后端可能还没上这个接口"
|
||||||
} else {
|
} else {
|
||||||
this
|
"请求失败($detail),请稍后重试"
|
||||||
|
}
|
||||||
|
Result.failure(ApiException(message))
|
||||||
|
}
|
||||||
|
|
||||||
|
error is java.io.IOException -> Result.failure(ApiException("网络不可用,请检查网络或设置里的 API 地址"))
|
||||||
|
|
||||||
|
else -> this
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
suspend fun login(username: String, password: String): Result<String> = runCatching {
|
suspend fun login(username: String, password: String): Result<String> = call {
|
||||||
val env = api.login(LoginRequest(username, password))
|
val env = api.login(LoginRequest(username, password))
|
||||||
if (env.code != 200) throw ApiException(env.message?.takeIf { it.isNotBlank() } ?: "登录失败")
|
if (env.code != 200) throw ApiException(env.message?.takeIf { it.isNotBlank() } ?: "登录失败")
|
||||||
extractToken(env.data)?.takeIf { it.isNotBlank() } ?: throw ApiException("登录响应缺少 token")
|
extractToken(env.data)?.takeIf { it.isNotBlank() } ?: throw ApiException("登录响应缺少 token")
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun logout(): Result<Unit> = runCatching { api.logout() }
|
suspend fun logout(): Result<Unit> = call { api.logout() }
|
||||||
|
|
||||||
suspend fun tasks(): Result<List<TaskItem>> = runCatching {
|
suspend fun tasks(): Result<List<TaskItem>> = call {
|
||||||
envelope(api.tasks(), "获取任务").records
|
envelope(api.tasks(), "获取任务").records
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,41 +62,41 @@ class LptRepository(private val apiClient: ApiClient) {
|
|||||||
* - 传入 `excludeTaskNum` 时,属于该任务的会话不算冲突(后端直接返回 null);
|
* - 传入 `excludeTaskNum` 时,属于该任务的会话不算冲突(后端直接返回 null);
|
||||||
* - 业务失败(code != 200)与网络异常一律上抛:调用方需要区分「确实没有会话」和「没问到」。
|
* - 业务失败(code != 200)与网络异常一律上抛:调用方需要区分「确实没有会话」和「没问到」。
|
||||||
*/
|
*/
|
||||||
suspend fun activeSession(excludeTaskNum: String? = null): Result<ActiveSession?> = runCatching {
|
suspend fun activeSession(excludeTaskNum: String? = null): Result<ActiveSession?> = call {
|
||||||
val env = api.activeSession(excludeTaskNum)
|
val env = api.activeSession(excludeTaskNum)
|
||||||
if (env.code != 200) throw ApiException(env.message?.takeIf { it.isNotBlank() } ?: "查询未结束会话失败")
|
if (env.code != 200) throw ApiException(env.message?.takeIf { it.isNotBlank() } ?: "查询未结束会话失败")
|
||||||
env.data?.takeIf { it.sessionNum.isNotBlank() }
|
env.data?.takeIf { it.sessionNum.isNotBlank() }
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun startOrContinue(taskNum: String): Result<SessionDetail> = runCatching {
|
suspend fun startOrContinue(taskNum: String): Result<SessionDetail> = call {
|
||||||
envelope(api.startOrContinue(taskNum), "开始学习会话")
|
envelope(api.startOrContinue(taskNum), "开始学习会话")
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun sessionDetail(sessionNum: String): Result<SessionDetail> = runCatching {
|
suspend fun sessionDetail(sessionNum: String): Result<SessionDetail> = call {
|
||||||
envelope(api.sessionDetail(sessionNum), "获取会话")
|
envelope(api.sessionDetail(sessionNum), "获取会话")
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getExpectation(sessionNum: String): Result<String> = runCatching {
|
suspend fun getExpectation(sessionNum: String): Result<String> = call {
|
||||||
api.getExpectation(sessionNum).takeIf { it.code == 200 }?.data?.description.orEmpty()
|
api.getExpectation(sessionNum).takeIf { it.code == 200 }?.data?.description.orEmpty()
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun putExpectation(sessionNum: String, description: String): Result<Unit> = runCatching {
|
suspend fun putExpectation(sessionNum: String, description: String): Result<Unit> = call {
|
||||||
envelope(api.putExpectation(sessionNum, ExpectationRequest(description)), "保存学习预期")
|
envelope(api.putExpectation(sessionNum, ExpectationRequest(description)), "保存学习预期")
|
||||||
Unit
|
Unit
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun continueSession(sessionNum: String): Result<Unit> = runCatching {
|
suspend fun continueSession(sessionNum: String): Result<Unit> = call {
|
||||||
envelope(api.continueSession(sessionNum), "继续学习会话")
|
envelope(api.continueSession(sessionNum), "继续学习会话")
|
||||||
Unit
|
Unit
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun pauseSession(sessionNum: String): Result<Unit> = runCatching {
|
suspend fun pauseSession(sessionNum: String): Result<Unit> = call {
|
||||||
envelope(api.pauseSession(sessionNum), "暂停学习会话")
|
envelope(api.pauseSession(sessionNum), "暂停学习会话")
|
||||||
Unit
|
Unit
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 结束会话;后端可能返回一条提示(如有效时间不足),作为 message 带回 */
|
/** 结束会话;后端可能返回一条提示(如有效时间不足),作为 message 带回 */
|
||||||
suspend fun endSession(sessionNum: String, sections: ReportSections): Result<String?> = runCatching {
|
suspend fun endSession(sessionNum: String, sections: ReportSections): Result<String?> = call {
|
||||||
val env = api.endSession(
|
val env = api.endSession(
|
||||||
sessionNum,
|
sessionNum,
|
||||||
EndSessionRequest(
|
EndSessionRequest(
|
||||||
@@ -97,12 +110,12 @@ class LptRepository(private val apiClient: ApiClient) {
|
|||||||
env.message
|
env.message
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun abortSession(sessionNum: String, confirmation: String): Result<Unit> = runCatching {
|
suspend fun abortSession(sessionNum: String, confirmation: String): Result<Unit> = call {
|
||||||
envelope(api.abortSession(sessionNum, AbortRequest(confirmation)), "误操作结束")
|
envelope(api.abortSession(sessionNum, AbortRequest(confirmation)), "误操作结束")
|
||||||
Unit
|
Unit
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun createFragment(sessionNum: String, content: String): Result<Unit> = runCatching {
|
suspend fun createFragment(sessionNum: String, content: String): Result<Unit> = call {
|
||||||
envelope(
|
envelope(
|
||||||
api.createFragment(CreateFragmentRequest(contextNum = sessionNum, sessionNum = sessionNum, content = content)),
|
api.createFragment(CreateFragmentRequest(contextNum = sessionNum, sessionNum = sessionNum, content = content)),
|
||||||
"记录碎片",
|
"记录碎片",
|
||||||
@@ -110,7 +123,7 @@ class LptRepository(private val apiClient: ApiClient) {
|
|||||||
Unit
|
Unit
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun fragments(sessionNum: String): Result<List<FragmentItem>> = runCatching {
|
suspend fun fragments(sessionNum: String): Result<List<FragmentItem>> = call {
|
||||||
api.fragmentsBySession(sessionNum).takeIf { it.code == 200 }?.data.orEmpty()
|
api.fragmentsBySession(sessionNum).takeIf { it.code == 200 }?.data.orEmpty()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import androidx.compose.ui.unit.dp
|
|||||||
@Composable
|
@Composable
|
||||||
fun LoginScreen(
|
fun LoginScreen(
|
||||||
initialBaseUrl: String,
|
initialBaseUrl: String,
|
||||||
|
notice: String? = null,
|
||||||
onLogin: (username: String, password: String, baseUrl: String, onResult: (String?) -> Unit) -> Unit,
|
onLogin: (username: String, password: String, baseUrl: String, onResult: (String?) -> Unit) -> Unit,
|
||||||
) {
|
) {
|
||||||
var username by remember { mutableStateOf("") }
|
var username by remember { mutableStateOf("") }
|
||||||
@@ -55,6 +56,16 @@ fun LoginScreen(
|
|||||||
)
|
)
|
||||||
Spacer(Modifier.height(24.dp))
|
Spacer(Modifier.height(24.dp))
|
||||||
|
|
||||||
|
if (notice != null) {
|
||||||
|
// 一直留到下次登录成功:否则用户回到登录页时已经看不到原因了
|
||||||
|
Text(
|
||||||
|
notice,
|
||||||
|
color = MaterialTheme.colorScheme.error,
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(8.dp))
|
||||||
|
}
|
||||||
|
|
||||||
OutlinedTextField(
|
OutlinedTextField(
|
||||||
value = username,
|
value = username,
|
||||||
onValueChange = { username = it },
|
onValueChange = { username = it },
|
||||||
|
|||||||
@@ -374,7 +374,8 @@ private fun EndSessionDialog(
|
|||||||
fun currentSections(): ReportSections = ReportSections(summary, verdict, free)
|
fun currentSections(): ReportSections = ReportSections(summary, verdict, free)
|
||||||
|
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
if (currentSections().allBlank && hasFragments) onGenerateDraft()
|
// 已经有缓存草稿时直接用它,不要为了重开弹窗再化一次 AI
|
||||||
|
if (currentSections().allBlank && hasFragments && state.draft == null) onGenerateDraft()
|
||||||
}
|
}
|
||||||
// 草稿是整段覆盖的:它就是这次生成的编辑起点
|
// 草稿是整段覆盖的:它就是这次生成的编辑起点
|
||||||
LaunchedEffect(state.draft) {
|
LaunchedEffect(state.draft) {
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ fun TaskListScreen(
|
|||||||
onRefresh: () -> Unit,
|
onRefresh: () -> Unit,
|
||||||
onStart: (TaskItem) -> Unit,
|
onStart: (TaskItem) -> Unit,
|
||||||
onOpenReports: (TaskItem) -> Unit,
|
onOpenReports: (TaskItem) -> Unit,
|
||||||
|
hasActiveSession: Boolean,
|
||||||
|
onOpenSession: () -> Unit,
|
||||||
onOpenSettings: () -> Unit,
|
onOpenSettings: () -> Unit,
|
||||||
onOpenPermissions: () -> Unit,
|
onOpenPermissions: () -> Unit,
|
||||||
onLogout: () -> Unit,
|
onLogout: () -> Unit,
|
||||||
@@ -56,6 +58,33 @@ fun TaskListScreen(
|
|||||||
TextButton(onClick = onOpenSettings) { Text("设置") }
|
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) {
|
if (error != null) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|||||||
Reference in New Issue
Block a user