dsh-go-exam-helper 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-go-exam-helper",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "DSH Go 答题助手：盯住考试页面，把答案弹在顶部通知里。题库可选，图形题走视觉。",
   "keywords": [
     "dsh",

package/payload/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

package/payload/watch.mjs

@@ -144,10 +144,36 @@ async function shoot (p) {
   return file
 }
 
+
+// 读屏被掐断的状态：只在开始时提醒一次，别刷屏
+function noteReadFault (why) {
+  state.fault = true
+  const now = Date.now()
+  if (!state.faultAt || now - state.faultAt > 120_000) {
+    state.faultAt = now
+    log('读屏被系统停止', String(why || '').slice(0, 40))
+    if (pc) pc.callTool('notify', { title: '答题助手：读屏停了', text: '切到 DSH 一次（或点悬浮球）再回去继续答题，就会自动恢复' }).catch(() => {})
+  }
+}
+
+function clearReadFault () {
+  if (!state.fault) return
+  state.fault = false
+  state.faultAt = 0
+  log('读屏恢复')
+}
+
 async function tick (p) {
   const t0 = Date.now()
   const r = await withTimeout(p.callTool('screen', {}), 6000, '读屏')
   const dump = r.text || ''
+  // 手机操控会话被系统断掉（息屏、切后台、用户点了停）时，桥接返回 isError 而不是抛错，
+  // 这时候要明确告诉用户，否则看起来就是"不动了"。
+  if ((r.raw && r.raw.isError) || /已停止本次手机操作|屏幕关闭|没有权限|not allowed/i.test(dump)) {
+    noteReadFault(dump)
+    return
+  }
+  clearReadFault()
   if (!dump || /DSH 自己的界面/.test(dump) || /· DSH Go ·/.test(dump)) { state.sig = ''; state.stable = 0; return }
 
   let screen = parseScreen(dump)
@@ -360,6 +386,7 @@ log('题库', bank ? bank.size + ' 题' : '未加载（放 bank.json 到目录
 const isConnError = (msg) => /closed|ECONNREFUSED|EPIPE|ECONNRESET|ENOENT/i.test(String(msg))
 
 let p = null
+let pc = null
 let restarts = 0
 let backoff = 1000
 
@@ -368,6 +395,7 @@ for (;;) {
     if (!p) {
       p = await connect()
       await p.init()
+      pc = p
       log(restarts === 0 ? '已连接桥接' : `已重连桥接 #${restarts}`)
       backoff = 1000
     }
@@ -385,5 +413,5 @@ for (;;) {
     }
   }
   // 在答题页上把轮询压到 350ms（切题能更快被发现）；其他时候保持 900ms 省电
-  await new Promise((res) => setTimeout(res, state.examSeen ? 350 : 900))
+  await new Promise((res) => setTimeout(res, state.fault ? 3000 : (state.examSeen ? 350 : 900)))
 }