diff --git a/miniprogram/pages/auto-scan/auto-scan.js b/miniprogram/pages/auto-scan/auto-scan.js index be3da1b..de3f39a 100644 --- a/miniprogram/pages/auto-scan/auto-scan.js +++ b/miniprogram/pages/auto-scan/auto-scan.js @@ -48,6 +48,7 @@ Page({ self._frameCount = 0 self._completed = false self._collecting = false + self._seenRunState1 = false self._lastFitting = -1 self._lastRunState = -1 self.setData({ phase: 'waiting_fit', frameCount: 0, pdAvg: [], error: '' }) @@ -73,13 +74,17 @@ Page({ self._lastRunState = data.run_state } + if (data.run_state === 1) { + self._seenRunState1 = true + } + if (self._lastFitting === 1 && data.run_state === 1 && !self._collecting) { console.log('[SCAN] 贴合确认,开始采集PD数据') self._collecting = true self.setData({ phase: 'collecting' }) } - if (self._lastFitting === 0 && data.run_state === 0 && self.data.phase === 'waiting_fit') { + if (self._seenRunState1 && self._lastFitting === 0 && data.run_state === 0 && self.data.phase === 'waiting_fit') { console.log('[SCAN] 未贴合,检测失败') self._completed = true self._cleanup()