feat(diagnosis): 按新协议实现多光谱诊断算法+分区差异化下发+报告面罩图
- 新协议《协议简述-添加扫描时光色》落地: FFE4 Byte17 高3位=扫描光色(1红/2红外/3紫外/4暖黄), 低5位保留贴合状态; Byte18=0xFF 故障; auto-scan 按光色分桶采集(旧固件无标识归 red 桶降级) - diagnosis.js 重写: PD极性(值大=吸收多,固件已确认) NR=本区/本色5区平均-1; 每区4色argmax>0.10判定; 3路PD区几何平均+MAD剔奇异(3σ对n=3失效,审计实证); 严重度0.05/0.15/0.30仅展示; 全参数走 diagnosis_config 热调(极性/阈值/PD映射/亮度) - buildVendorCommand 支持 plan 多区多色单命令下发(每IO独立 红/红外/紫外/暖黄); builder层安全硬上限 治疗亮度≤204(80%) 时长≤600s - 区域映射修正: 掩码=IO纵列 左0x01/中上0x02/中0x04/中下0x08/右0x10, 修复 treatment-setup/manual/treating/getRegionName/i18n 共7处标签错位, FULL_FACE 0x7F→0x1F - 扫描报告页: 新增分区面罩示意图(5区按推荐光着色+模式名+严重度,点击跳光疗介绍), 推荐护理改一条命令多色下发(亮度204); 扫描中设备故障即时中止 - schema.sql diagnosis_config 种子更新(新结构); i18n 清理死键,中英对齐25/24键
这个提交包含在:
@@ -51,7 +51,8 @@ Page({
|
||||
return
|
||||
}
|
||||
|
||||
self._pdSum = [0, 0, 0, 0, 0, 0, 0]
|
||||
// 按扫描光色分桶累加(FFE4 Byte17 高三位,新协议)。旧固件无标识 → 全部归 red 桶。
|
||||
self._buckets = {}
|
||||
self._frameCount = 0
|
||||
self._completed = false
|
||||
self._collecting = false
|
||||
@@ -81,6 +82,15 @@ Page({
|
||||
self._lastRunState = data.run_state
|
||||
}
|
||||
|
||||
// 设备故障(Byte18=0xFF):立即中止,不等 3 分钟超时
|
||||
if (data.run_state === 0xFF) {
|
||||
console.error('[SCAN] 设备故障,中止扫描')
|
||||
self._completed = true
|
||||
self._cleanup()
|
||||
self.setData({ phase: 'ready', error: i18n.t('autoScan.deviceFault') })
|
||||
return
|
||||
}
|
||||
|
||||
if (data.run_state === 1) {
|
||||
self._seenRunState1 = true
|
||||
}
|
||||
@@ -110,10 +120,17 @@ Page({
|
||||
if (self._completed || !self._collecting) return
|
||||
if (!data || !data.pd || data.pd.length < 7) return
|
||||
|
||||
self._frameCount++
|
||||
for (var i = 0; i < 7; i++) {
|
||||
self._pdSum[i] += data.pd[i]
|
||||
var wave = data.scan_wave || 'red' // 旧固件帧无光色标识,按单波长红光兼容
|
||||
var bucket = self._buckets[wave]
|
||||
if (!bucket) {
|
||||
bucket = { sum: [0, 0, 0, 0, 0, 0, 0], n: 0 }
|
||||
self._buckets[wave] = bucket
|
||||
}
|
||||
bucket.n++
|
||||
for (var i = 0; i < 7; i++) {
|
||||
bucket.sum[i] += data.pd[i]
|
||||
}
|
||||
self._frameCount++
|
||||
self.setData({
|
||||
frameCount: self._frameCount,
|
||||
vbat: data.vbat || self.data.vbat,
|
||||
@@ -155,28 +172,35 @@ Page({
|
||||
this._completed = true
|
||||
this._cleanup()
|
||||
|
||||
var avg = []
|
||||
var count = this._frameCount || 1
|
||||
for (var i = 0; i < 7; i++) {
|
||||
avg.push(Math.round(this._pdSum[i] / count))
|
||||
// 每个光色桶各自求平均 → waves: { red:[7], ir:[7], uv:[7], yellow:[7] }(有几色算几色)
|
||||
var waves = {}
|
||||
var firstAvg = []
|
||||
for (var wave in this._buckets) {
|
||||
if (!this._buckets.hasOwnProperty(wave)) continue
|
||||
var b = this._buckets[wave]
|
||||
if (!b.n) continue
|
||||
var avg = []
|
||||
for (var i = 0; i < 7; i++) avg.push(Math.round(b.sum[i] / b.n))
|
||||
waves[wave] = avg
|
||||
if (!firstAvg.length) firstAvg = avg
|
||||
}
|
||||
|
||||
this.setData({ phase: 'done', pdAvg: avg, frameCount: count })
|
||||
getApp().globalData.lastScanPdAvg = avg
|
||||
console.log('[SCAN] PD平均值:', avg, '帧数:', count)
|
||||
this.setData({ phase: 'done', pdAvg: firstAvg, frameCount: this._frameCount })
|
||||
getApp().globalData.lastScanPdAvg = firstAvg
|
||||
console.log('[SCAN] 分桶结果:', JSON.stringify(Object.keys(waves).map(function (k) { return k })), '总帧数:', this._frameCount)
|
||||
|
||||
this._buildAndGoReport(avg)
|
||||
this._buildAndGoReport(waves)
|
||||
},
|
||||
|
||||
// Scan finished -> run the (placeholder) diagnosis, store + persist a report, and
|
||||
// navigate to the report page so the user sees their skin tendencies and chooses
|
||||
// care. This replaces the previous auto-start-treatment behavior.
|
||||
//
|
||||
// NOTE: today only single-wavelength red PD is collected, and the thresholds +
|
||||
// PD->region mapping in services/diagnosis.js are placeholders pending calibration.
|
||||
// Report + persistence work end to end regardless; the numbers get real after
|
||||
// 4-wavelength scan collection and calibration land.
|
||||
_buildAndGoReport: function (avg) {
|
||||
// NOTE: thresholds + PD->region mapping in services/diagnosis.js are placeholders
|
||||
// pending hardware confirmation / calibration (tunable via server diagnosis_config).
|
||||
// Old firmware sends no wave marker -> everything lands in the red bucket and the
|
||||
// pipeline degrades to single-wavelength gracefully.
|
||||
_buildAndGoReport: function (waves) {
|
||||
var self = this
|
||||
var app = getApp()
|
||||
var mask = self.data.regions || 0x1F
|
||||
@@ -185,7 +209,7 @@ Page({
|
||||
var scannedAt = Date.now()
|
||||
|
||||
function proceed(config) {
|
||||
var scanData = diagnosis.fromRedScan(avg, mask, deviceId, scannedAt)
|
||||
var scanData = diagnosis.buildScanData(waves, mask, deviceId, scannedAt)
|
||||
var report = diagnosis.analyze(scanData, config || diagnosis.DEFAULT_CONFIG)
|
||||
app.globalData.lastScanReport = report
|
||||
|
||||
@@ -205,7 +229,9 @@ Page({
|
||||
}
|
||||
|
||||
api.getDiagnosisConfig().then(function (cfg) {
|
||||
proceed(cfg && cfg.levels ? cfg : diagnosis.DEFAULT_CONFIG)
|
||||
// 非空对象即采用——缺失字段由 analyze 逐项回退 DEFAULT;只发部分字段(如仅调 pd_region_map)也生效
|
||||
var usable = cfg && typeof cfg === 'object' && Object.keys(cfg).length > 0
|
||||
proceed(usable ? cfg : diagnosis.DEFAULT_CONFIG)
|
||||
}).catch(function () {
|
||||
proceed(diagnosis.DEFAULT_CONFIG)
|
||||
})
|
||||
|
||||
在新工单中引用
屏蔽一个用户