比较提交
3
次代码提交
| 作者 | SHA1 | 提交日期 | |
|---|---|---|---|
|
|
94c9af146a | ||
|
|
784af52b7a | ||
|
|
06e8c9831c |
@@ -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()
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
<view class="logout-btn" bindtap="onLogout">退出登录</view>
|
||||
|
||||
<view class="version-text">v0.1.7</view>
|
||||
<view class="version-text">v0.1.8</view>
|
||||
</view>
|
||||
|
||||
<!-- Edit profile modal -->
|
||||
|
||||
@@ -87,6 +87,7 @@ Page({
|
||||
},
|
||||
|
||||
onFitting: function (data) {
|
||||
if (this.data.mode === 0) return
|
||||
if (this.data.completed) return
|
||||
if (data.fitting === 0 && !this.data.fittingLost) {
|
||||
this.setData({ fittingLost: true, paused: true })
|
||||
@@ -98,6 +99,7 @@ Page({
|
||||
},
|
||||
|
||||
onRunState: function (data) {
|
||||
if (this.data.mode === 0) return
|
||||
if (this._finishing) return
|
||||
console.log('[TREAT] run_state:', data.run_state)
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户