From 6b91ebe35d52f201cbf7b7f2862da6ff1e56ee87 Mon Sep 17 00:00:00 2001 From: Guoguo Date: Tue, 28 Jul 2026 04:36:51 -0700 Subject: [PATCH] =?UTF-8?q?feat(diagnosis):=20=E6=8C=89=E6=96=B0=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E5=AE=9E=E7=8E=B0=E5=A4=9A=E5=85=89=E8=B0=B1=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E7=AE=97=E6=B3=95+=E5=88=86=E5=8C=BA=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=E5=8C=96=E4=B8=8B=E5=8F=91+=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E9=9D=A2=E7=BD=A9=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新协议《协议简述-添加扫描时光色》落地: 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键 --- docs/protocols/协议简述-添加扫描时光色.docx | Bin 0 -> 19515 bytes miniprogram/i18n/locales/autoScan.js | 2 + miniprogram/i18n/locales/common.js | 14 +- miniprogram/i18n/locales/report.js | 28 +- miniprogram/i18n/locales/treating.js | 4 - miniprogram/pages/auto-scan/auto-scan.js | 64 ++-- miniprogram/pages/light-info/light-info.js | 7 +- miniprogram/pages/light-info/light-info.wxml | 2 +- miniprogram/pages/light-info/light-info.wxss | 6 + .../manual-treatment/manual-treatment.js | 12 +- miniprogram/pages/scan-report/scan-report.js | 68 +++-- .../pages/scan-report/scan-report.wxml | 60 +++- .../pages/scan-report/scan-report.wxss | 67 +++++ miniprogram/pages/treating/treating.js | 17 +- .../pages/treatment-setup/treatment-setup.js | 3 +- miniprogram/services/ble/connection.js | 2 +- miniprogram/services/ble/protocol.js | 108 ++++--- miniprogram/services/diagnosis.js | 273 ++++++++++-------- server/sql/schema.sql | 2 +- 19 files changed, 505 insertions(+), 234 deletions(-) create mode 100644 docs/protocols/协议简述-添加扫描时光色.docx diff --git a/docs/protocols/协议简述-添加扫描时光色.docx b/docs/protocols/协议简述-添加扫描时光色.docx new file mode 100644 index 0000000000000000000000000000000000000000..196f9898751721187b168a3cd217a258a6d99d5e GIT binary patch literal 19515 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 WBLUv5;7l(BY=HX%Q{y#vkR||V58jag literal 0 HcmV?d00001 diff --git a/miniprogram/i18n/locales/autoScan.js b/miniprogram/i18n/locales/autoScan.js index 95c7609..638b9ff 100644 --- a/miniprogram/i18n/locales/autoScan.js +++ b/miniprogram/i18n/locales/autoScan.js @@ -17,6 +17,7 @@ module.exports = { doneStatusPost: ' 帧），正在启动治疗...', notWorn: '面膜未佩戴好，请重新佩戴后再试', timeout: '检测超时，未收到数据，请重试', + deviceFault: '设备异常，扫描已停止，请重启设备后再试', cmdFailed: '检测命令发送失败' }, en: { @@ -35,6 +36,7 @@ module.exports = { doneStatusPost: ' frames), starting treatment...', notWorn: 'The mask is not worn properly. Please re-fit and try again', timeout: 'Scan timed out with no data. Please try again', + deviceFault: 'Device error — scan stopped. Please restart the device and try again', cmdFailed: 'Failed to send scan command' } } diff --git a/miniprogram/i18n/locales/common.js b/miniprogram/i18n/locales/common.js index 23228d0..ed378f9 100644 --- a/miniprogram/i18n/locales/common.js +++ b/miniprogram/i18n/locales/common.js @@ -18,12 +18,14 @@ module.exports = { saveFailed: '保存失败', networkError: '网络异常，请重试', deviceNotConnected: '设备未连接', + // 区域 = IO 纵列布局：left=IO1(0x01) top=IO2(0x02中上) middle=IO3(0x04中) + // bottom=IO4(0x08中下) right=IO5(0x10)。key 名沿用，语义以掩码为准。 regions: { - right: '右区', left: '左区', - top: '上区', + top: '中上区', middle: '中区', - bottom: '下区' + bottom: '中下区', + right: '右区' }, wavelengths: { red: '红光', @@ -51,11 +53,11 @@ module.exports = { networkError: 'Network error, please retry', deviceNotConnected: 'Device not connected', regions: { - right: 'Right', left: 'Left', - top: 'Top', + top: 'Upper Center', middle: 'Center', - bottom: 'Bottom' + bottom: 'Lower Center', + right: 'Right' }, wavelengths: { red: 'Red', diff --git a/miniprogram/i18n/locales/report.js b/miniprogram/i18n/locales/report.js index 1d57fdc..692cf12 100644 --- a/miniprogram/i18n/locales/report.js +++ b/miniprogram/i18n/locales/report.js @@ -5,6 +5,9 @@ module.exports = { subtitle: '基于多光谱反射的肤质倾向参考', scannedAt: '扫描时间', overallTitle: '整体倾向', + faceTitle: '分区光疗方案', + faceTapHint: '点击分区可查看该光的功效介绍', + allNormalHint: '未发现明显问题区域，可进行日常舒缓养护', regionTitle: '分区分析', recommendTitle: '推荐护理', noProblem: '未见明显倾向', @@ -19,12 +22,11 @@ module.exports = { pigment: '色素 / 暗黄', deep: '深层循环 / 疲劳' }, - regionNames: { - right: '右脸', - left: '左脸', - top: '额头', - middle: '鼻区', - bottom: '下巴' + modeNames: { + red: '嫩肤焕亮', + ir: '深层焕活', + uv: '净痘控油', + yellow: '匀净提亮' } }, en: { @@ -32,6 +34,9 @@ module.exports = { subtitle: 'Skin-tendency reference from multispectral reflection', scannedAt: 'Scanned at', overallTitle: 'Overall Tendency', + faceTitle: 'Zone Care Map', + faceTapHint: 'Tap a zone to learn about its light', + allNormalHint: 'No notable concerns found — a gentle daily care session works well', regionTitle: 'Zone Analysis', recommendTitle: 'Recommended Care', noProblem: 'No notable tendency', @@ -46,12 +51,11 @@ module.exports = { pigment: 'Pigment / Sallowness', deep: 'Deep circulation / Fatigue' }, - regionNames: { - right: 'Right cheek', - left: 'Left cheek', - top: 'Forehead', - middle: 'Nose', - bottom: 'Chin' + modeNames: { + red: 'Glow & Firm', + ir: 'Deep Revive', + uv: 'Clear & Balance', + yellow: 'Even & Brighten' } } } diff --git a/miniprogram/i18n/locales/treating.js b/miniprogram/i18n/locales/treating.js index 4d7f233..e5149ef 100644 --- a/miniprogram/i18n/locales/treating.js +++ b/miniprogram/i18n/locales/treating.js @@ -7,8 +7,6 @@ module.exports = { smartMode: '✨ 智能模式', normalMode: '🔄 普通模式', allRegions: '全区域', - regionTopLeft: '左上区', - regionTopRight: '右上区', relax1: '请放松心情', relax2: '享受美好时光', stopBtn: '停止使用', @@ -35,8 +33,6 @@ module.exports = { smartMode: '✨ Smart Mode', normalMode: '🔄 Normal Mode', allRegions: 'All regions', - regionTopLeft: 'Top-left', - regionTopRight: 'Top-right', relax1: 'Relax and unwind', relax2: 'Enjoy your moment', stopBtn: 'Stop', diff --git a/miniprogram/pages/auto-scan/auto-scan.js b/miniprogram/pages/auto-scan/auto-scan.js index cf17e52..8a114f4 100644 --- a/miniprogram/pages/auto-scan/auto-scan.js +++ b/miniprogram/pages/auto-scan/auto-scan.js @@ -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) }) diff --git a/miniprogram/pages/light-info/light-info.js b/miniprogram/pages/light-info/light-info.js index bb98c3e..c2f570c 100644 --- a/miniprogram/pages/light-info/light-info.js +++ b/miniprogram/pages/light-info/light-info.js @@ -15,9 +15,12 @@ Page({ modeColors: ['#E8503A', '#7C4DFF', '#F5B841', '#8B2E3C', '#F08AA8'] }, - onLoad: function () { + onLoad: function (options) { var app = getApp() - this.setData({ statusBarHeight: app.globalData.statusBarHeight }) + // 报告页分区跳转带 ?wave=red|ir|uv|yellow，高亮对应光卡片（'ir' 对应本页 key 'infrared'） + var focus = (options && options.wave) || '' + if (focus === 'ir') focus = 'infrared' + this.setData({ statusBarHeight: app.globalData.statusBarHeight, focusWave: focus }) }, onShow: function () { diff --git a/miniprogram/pages/light-info/light-info.wxml b/miniprogram/pages/light-info/light-info.wxml index bb33004..3872d70 100644 --- a/miniprogram/pages/light-info/light-info.wxml +++ b/miniprogram/pages/light-info/light-info.wxml @@ -8,7 +8,7 @@ {{i18n.lightInfo.lightsSectionTitle}} - + diff --git a/miniprogram/pages/light-info/light-info.wxss b/miniprogram/pages/light-info/light-info.wxss index af9b6f7..121f9fc 100644 --- a/miniprogram/pages/light-info/light-info.wxss +++ b/miniprogram/pages/light-info/light-info.wxss @@ -123,3 +123,9 @@ line-height: 1.6; text-align: center; } + +/* 从扫描报告分区跳转时高亮对应光 */ +.light-card-focus { + border: 2rpx solid rgba(60, 60, 60, 0.35); + box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.10); +} diff --git a/miniprogram/pages/manual-treatment/manual-treatment.js b/miniprogram/pages/manual-treatment/manual-treatment.js index 6a7176d..ae250ce 100644 --- a/miniprogram/pages/manual-treatment/manual-treatment.js +++ b/miniprogram/pages/manual-treatment/manual-treatment.js @@ -23,13 +23,13 @@ Page({ ], selectedFunctionId: 'rejuvenate', selectedWavelength: 2, - // region mask mapping identical to treatment-setup: 右=0x01 左=0x02 上=0x04 中=0x08 下=0x10 + // 掩码 = IO 纵列布局（与 treatment-setup 一致）：左=0x01 中上=0x02 中=0x04 中下=0x08 右=0x10 regions: [ - { key: 'right', mask: 0x01, checked: true }, - { key: 'left', mask: 0x02, checked: true }, - { key: 'top', mask: 0x04, checked: true }, - { key: 'middle', mask: 0x08, checked: true }, - { key: 'bottom', mask: 0x10, checked: true } + { key: 'left', mask: 0x01, checked: true }, + { key: 'top', mask: 0x02, checked: true }, + { key: 'middle', mask: 0x04, checked: true }, + { key: 'bottom', mask: 0x08, checked: true }, + { key: 'right', mask: 0x10, checked: true } ], // safety: a single session must NOT exceed 10 minutes (hardware caps at 10). durations: [5, 10], diff --git a/miniprogram/pages/scan-report/scan-report.js b/miniprogram/pages/scan-report/scan-report.js index c6a50cf..4a08973 100644 --- a/miniprogram/pages/scan-report/scan-report.js +++ b/miniprogram/pages/scan-report/scan-report.js @@ -3,7 +3,8 @@ var ble = require('../../services/ble') var diagnosis = require('../../services/diagnosis') var i18n = require('../../i18n/index') -var WAVE_CODE_KEY = { 1: 'infrared', 2: 'red', 3: 'uv', 4: 'yellow' } +// diagnosis 的 wave key ('ir') 与 common.wavelengths 的 key ('infrared') 不同名，需映射 +var WAVE_COMMON_KEY = { red: 'red', ir: 'infrared', uv: 'uv', yellow: 'yellow' } function pad2(n) { return (n < 10 ? '0' : '') + n } @@ -24,6 +25,7 @@ Page({ overallList: [], regionList: [], recommendList: [], + faceZones: [], starting: false, error: '' }, @@ -111,9 +113,16 @@ Page({ return { label: d.problems[o.type] || o.type, level: o.level, levelLabel: levelLabel(o.level) } }) + function regionName(key) { + return (common.regions && common.regions[key]) || key + } + function modeName(waveKey) { + return (d.modeNames && d.modeNames[waveKey]) || '' + } + var regionList = (report.regions || []).map(function (r) { return { - name: d.regionNames[r.region] || r.region, + name: regionName(r.region), level: r.level, levelLabel: levelLabel(r.level), problemLabel: r.top_problem ? (d.problems[r.top_problem] || r.top_problem) : d.noProblem, @@ -121,22 +130,34 @@ Page({ } }) - var defs = diagnosis.REGION_DEFS + // 推荐护理：现在 recommend_plan 每区一条(可不同色)，一条 BLE 命令可全部下发 var recommendList = (report.recommend_plan || []).map(function (p) { - var names = [] - for (var i = 0; i < defs.length; i++) { - if (p.mask & defs[i].mask) names.push(d.regionNames[defs[i].key] || defs[i].key) - } - var waveKey = WAVE_CODE_KEY[p.wavelength] return { - label: d.problems[p.label_key] || '', - wavelengthLabel: (waveKey && common.wavelengths[waveKey]) || '', - regionsLabel: names.join('、'), - wavelength: p.wavelength, + modeLabel: modeName(p.wave), + wavelengthLabel: common.wavelengths[WAVE_COMMON_KEY[p.wave]] || '', + regionsLabel: regionName(p.region), + levelLabel: levelLabel(p.level), mask: p.mask } }) + // 面罩示意图数据（固定 5 区，未扫描/无问题的区置灰） + var byKey = {} + ;(report.regions || []).forEach(function (r) { byKey[r.region] = r }) + var faceZones = diagnosis.REGION_DEFS.map(function (def) { + var r = byKey[def.key] + var hasProblem = !!(r && r.top_problem && r.wave) + return { + key: def.key, + waveKey: hasProblem ? r.wave : null, + name: regionName(def.key), + hasProblem: hasProblem, + modeLabel: hasProblem ? modeName(r.wave) : '', + levelLabel: hasProblem ? levelLabel(r.level) : '', + colorClass: hasProblem ? 'zone-' + r.wave : 'zone-none' + } + }) + this._report = report this.setData({ loading: false, @@ -146,26 +167,37 @@ Page({ overallList: overallList, regionList: regionList, recommendList: recommendList, + faceZones: faceZones, error: '' }) }, + onTapZone: function (e) { + var wave = e.currentTarget.dataset.wave + wx.navigateTo({ url: '/pages/light-info/light-info' + (wave ? '?wave=' + wave : '') }) + }, + onStartRecommend: function () { var self = this var report = self._report || {} + var plan = report.recommend_plan || [] if (!ble.isConnected()) { self.setData({ error: i18n.t('common.deviceNotConnected') }) return } - var plan = (report.recommend_plan && report.recommend_plan[0]) || null - var mask = plan ? plan.mask : (report.recommend_mask || 0x1F) - var wl = plan ? plan.wavelength : 2 - if (!mask) mask = 0x1F + if (!plan.length) return + + // 一条 33B 命令携带全部分区差异化方案（每区各自的光色，亮度来自 diagnosis config，默认 204=80%） + var mask = report.recommend_mask || 0 + var wl = plan[0].wavelength || 2 // treating 页展示用（多色场景显示首个） self.setData({ starting: true, error: '' }) ble.setParams({ - region_mask: mask, wavelength: wl, brightness: 140, - duration_ms: 600000, mode: 1, control: 0x02 + plan: plan.map(function (p) { + return { mask: p.mask, wave: p.wave, brightness: p.brightness } + }), + duration_ms: 600000, + control: 0x02 }).then(function () { return ble.startTreatment(mask) }).then(function () { diff --git a/miniprogram/pages/scan-report/scan-report.wxml b/miniprogram/pages/scan-report/scan-report.wxml index 46fe595..71ef53a 100644 --- a/miniprogram/pages/scan-report/scan-report.wxml +++ b/miniprogram/pages/scan-report/scan-report.wxml @@ -30,6 +30,64 @@ {{i18n.report.noProblem}} + + + {{i18n.report.faceTitle}} + + + + {{faceZones[0].name}} + {{faceZones[0].modeLabel}} + {{faceZones[0].levelLabel}} + + + + + {{faceZones[1].name}} + {{faceZones[1].modeLabel}} + {{faceZones[1].levelLabel}} + + + {{faceZones[2].name}} + {{faceZones[2].modeLabel}} + {{faceZones[2].levelLabel}} + + + {{faceZones[3].name}} + {{faceZones[3].modeLabel}} + {{faceZones[3].levelLabel}} + + + + + {{faceZones[4].name}} + {{faceZones[4].modeLabel}} + {{faceZones[4].levelLabel}} + + + + + + + {{i18n.report.modeNames.red}} + + + + {{i18n.report.modeNames.ir}} + + + + {{i18n.report.modeNames.uv}} + + + + {{i18n.report.modeNames.yellow}} + + + {{i18n.report.faceTapHint}} + {{i18n.report.allNormalHint}} + + {{i18n.report.regionTitle}} @@ -48,7 +106,7 @@ - {{item.label}} + {{item.modeLabel}} {{item.wavelengthLabel}} · {{item.regionsLabel}} diff --git a/miniprogram/pages/scan-report/scan-report.wxss b/miniprogram/pages/scan-report/scan-report.wxss index 25323cb..3090feb 100644 --- a/miniprogram/pages/scan-report/scan-report.wxss +++ b/miniprogram/pages/scan-report/scan-report.wxss @@ -60,6 +60,73 @@ .empty-hint { color: #999; font-size: 26rpx; } +.face-map { + display: flex; + height: 480rpx; + gap: 8rpx; + padding: 12rpx; + box-sizing: border-box; + background: #FAFAFA; + border-radius: 32rpx; +} +.face-col { display: flex; flex-direction: column; flex: 1; gap: 8rpx; } +.face-col-mid { flex: 1.15; } +.face-zone { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + border-radius: 20rpx; + border: 2rpx solid transparent; + padding: 8rpx; + box-sizing: border-box; + transition: transform 0.1s ease; +} +.face-col-side .face-zone { border-radius: 28rpx; } +.face-zone:active { transform: scale(0.96); } +.face-zone-name { font-size: 26rpx; font-weight: 600; } +.face-zone-mode { font-size: 22rpx; margin-top: 6rpx; } +.face-zone-level { font-size: 20rpx; margin-top: 2rpx; opacity: 0.85; } + +.zone-red { + background: rgba(232, 93, 93, 0.14); + border-color: rgba(232, 93, 93, 0.4); + color: #B23C3C; +} +.zone-ir { + background: rgba(192, 107, 74, 0.14); + border-color: rgba(192, 107, 74, 0.4); + color: #8C4A2E; +} +.zone-uv { + background: rgba(142, 107, 216, 0.14); + border-color: rgba(142, 107, 216, 0.4); + color: #5F3FAE; +} +.zone-yellow { + background: rgba(232, 185, 61, 0.18); + border-color: rgba(232, 185, 61, 0.45); + color: #8A6A10; +} +.zone-none { + background: #F0F0F0; + border-color: #E5E5E5; + color: #999; +} + +.face-legend { display: flex; flex-wrap: wrap; margin-top: 20rpx; } +.legend-item { display: flex; align-items: center; margin: 0 20rpx 10rpx 0; } +.legend-dot { width: 16rpx; height: 16rpx; border-radius: 50%; margin-right: 8rpx; } +.legend-dot.zone-red { background: #E85D5D; border: none; } +.legend-dot.zone-ir { background: #C06B4A; border: none; } +.legend-dot.zone-uv { background: #8E6BD8; border: none; } +.legend-dot.zone-yellow { background: #E8B93D; border: none; } +.legend-label { font-size: 22rpx; color: #666; } + +.face-tap-hint { font-size: 22rpx; color: #bbb; margin-top: 14rpx; text-align: center; } +.face-all-normal-hint { font-size: 24rpx; color: #6BBF59; text-align: center; margin-top: 12rpx; } + .region-row { display: flex; align-items: center; diff --git a/miniprogram/pages/treating/treating.js b/miniprogram/pages/treating/treating.js index 85e811a..a3256a0 100644 --- a/miniprogram/pages/treating/treating.js +++ b/miniprogram/pages/treating/treating.js @@ -23,16 +23,15 @@ Page({ }, _getRegionText: function (regionMask) { + // 掩码 = IO 纵列布局：0x01左 0x02中上 0x04中 0x08中下 0x10右 var REGION_MAP = { - 1: 'common.regions.right', - 2: 'common.regions.left', - 4: 'common.regions.top', - 8: 'common.regions.middle', - 16: 'common.regions.bottom', - 32: 'treating.regionTopLeft', - 64: 'treating.regionTopRight' + 1: 'common.regions.left', + 2: 'common.regions.top', + 4: 'common.regions.middle', + 8: 'common.regions.bottom', + 16: 'common.regions.right' } - if (regionMask === 0x7F) return i18n.t('treating.allRegions') + if (regionMask === 0x1F) return i18n.t('treating.allRegions') var names = [] for (var bit in REGION_MAP) { if (regionMask & parseInt(bit)) names.push(i18n.t(REGION_MAP[bit])) @@ -48,7 +47,7 @@ Page({ var app = getApp() this.setData({ statusBarHeight: app.globalData.statusBarHeight }) this._deviceId = ble.getDeviceId() || (app.globalData.currentDevice && app.globalData.currentDevice.device_id) || '' - var regions = parseInt(options.regions) || 0x7F + var regions = parseInt(options.regions) || 0x1F this.setData({ regions: regions, wavelength: parseInt(options.wavelength) || 2, diff --git a/miniprogram/pages/treatment-setup/treatment-setup.js b/miniprogram/pages/treatment-setup/treatment-setup.js index 5716c0e..7308862 100644 --- a/miniprogram/pages/treatment-setup/treatment-setup.js +++ b/miniprogram/pages/treatment-setup/treatment-setup.js @@ -34,7 +34,8 @@ Page({ var app = getApp() this.setData({ statusBarHeight: app.globalData.statusBarHeight }) i18n.bind(this) - var regionKeys = ['right', 'left', 'top', 'middle', 'bottom'] + // 顺序对应 data.regions 的掩码 0x01..0x10（IO1..IO5 = 左/中上/中/中下/右） + var regionKeys = ['left', 'top', 'middle', 'bottom', 'right'] var regions = this.data.regions regions.forEach(function (r, i) { r.name = i18n.t('common.regions.' + regionKeys[i]) diff --git a/miniprogram/services/ble/connection.js b/miniprogram/services/ble/connection.js index fb4a267..df79b96 100644 --- a/miniprogram/services/ble/connection.js +++ b/miniprogram/services/ble/connection.js @@ -99,7 +99,7 @@ function handleValueChange(res) { console.warn('[BLE] ADC checksum mismatch, dropping') return } - emit('adc', { pd: parsed.pd, vbat: vbatMv, battery: batteryPct, fitting: parsed.fitting, run_state: parsed.run_state }) + emit('adc', { pd: parsed.pd, vbat: vbatMv, battery: batteryPct, fitting: parsed.fitting, scan_wave: parsed.scan_wave, run_state: parsed.run_state, is_fault: parsed.is_fault }) emit('battery', { battery: batteryPct, vbat: vbatMv }) emit('fitting', { fitting: parsed.fitting }) emit('run_state', { run_state: parsed.run_state }) diff --git a/miniprogram/services/ble/protocol.js b/miniprogram/services/ble/protocol.js index 4e78107..829be9e 100644 --- a/miniprogram/services/ble/protocol.js +++ b/miniprogram/services/ble/protocol.js @@ -57,18 +57,23 @@ var TREAT_MODE = { SMART: 1 } +// 区域 = IO 纵列布局（果果 2026-07 定案）：左=IO1(0x01)，中上=IO2(0x02)，中=IO3(0x04)， +// 中下=IO4(0x08)，右=IO5(0x10)。旧命名(左脸颊/额头/鼻部…)来自过时文档，与实物不符，已废弃。 var REGION = { - LEFT_CHEEK: 0x01, - RIGHT_CHEEK: 0x02, - FOREHEAD: 0x04, - CHIN: 0x08, - NOSE: 0x10, - LEFT_EYE: 0x20, - RIGHT_EYE: 0x40, - FULL_FACE: 0x7F + LEFT: 0x01, + TOP: 0x02, + MIDDLE: 0x04, + BOTTOM: 0x08, + RIGHT: 0x10, + FULL_FACE: 0x1F } -var REGION_NAMES = ['left_cheek', 'right_cheek', 'forehead', 'chin', 'nose', 'left_eye', 'right_eye'] +var REGION_NAMES = ['left', 'top', 'middle', 'bottom', 'right'] + +// FFE4 Byte17 高三位 = 扫描时光色指示（协议简述-添加扫描时光色.docx 2026-07）： +// 001=红光 010=红外 011=紫外(蓝) 100=暖黄。注意与下发命令的 WAVELENGTH 编码 +// (IR=1,R=2,UV=3,Y=4) 不同——1/2 正好是红与红外互换，绝不能复用那套常量。 +var SCAN_WAVE_KEY = { 1: 'red', 2: 'ir', 3: 'uv', 4: 'yellow' } var DEVICE_ERR = { 0x00: 'SUCCESS', @@ -167,37 +172,64 @@ var CONTROL = { TREAT: 0x02 } +// 每 IO 6 字节，颜色格顺序 [红][红外][紫外][暖黄]（厂商原表，新版协议简述再次确认）。 +// 两种调用方式： +// 单色广播（旧）：{ region_mask, wavelength(编码), brightness, ... } +// 分区差异化（新）：{ plan: [{ mask, wave:'red'|'ir'|'uv'|'yellow', brightness }], hold_time, control } +// —— 同一条命令里不同区可用不同颜色不同亮度（协议本身就支持 5 IO × 4 色独立）。 +var WAVE_BYTE_OFFSET = { red: 0, ir: 1, uv: 2, yellow: 3 } + +// 安全包线（builder 层硬上限，纵深防御——即使服务端 diagnosis_config 误配也不可突破）： +// 治疗亮度 ≤204(80%)，单次时长 ≤600s(10min)。固件侧安全机制大多未实现，此处是最后防线。 +var MAX_TREAT_BRIGHTNESS = 204 +var MAX_HOLD_SECONDS = 600 + function buildVendorCommand(options) { options = options || {} - var regionMask = options.region_mask || REGION.FULL_FACE - var wavelength = options.wavelength || WAVELENGTH.R - var brightness = clampByte(options.brightness === undefined ? 200 : options.brightness) var gain = clampUInt16(options.current_gain === undefined ? 0 : options.current_gain) var durationMs = options.duration_ms || 600000 var holdSeconds = clampUInt16(options.hold_time === undefined ? Math.round(durationMs / 1000) : options.hold_time) var control = options.control !== undefined ? options.control : CONTROL.TREAT - var regions = [ - REGION.LEFT_CHEEK, - REGION.RIGHT_CHEEK, - REGION.FOREHEAD, - REGION.CHIN, - REGION.NOSE - ] + if (holdSeconds > MAX_HOLD_SECONDS) holdSeconds = MAX_HOLD_SECONDS + var isTreat = control === CONTROL.TREAT + function clampTreat(b) { + b = clampByte(b) + return isTreat && b > MAX_TREAT_BRIGHTNESS ? MAX_TREAT_BRIGHTNESS : b + } + var ioMasks = [REGION.LEFT, REGION.TOP, REGION.MIDDLE, REGION.BOTTOM, REGION.RIGHT] // IO1..IO5 var bytes = [] + var i, j - for (var i = 0; i < regions.length; i++) { - var enabled = (regionMask & regions[i]) !== 0 - var red = 0 - var infrared = 0 - var uv = 0 - var warmYellow = 0 - if (enabled) { - if (wavelength === WAVELENGTH.R) red = brightness - if (wavelength === WAVELENGTH.IR) infrared = brightness - if (wavelength === WAVELENGTH.UV) uv = brightness - if (wavelength === WAVELENGTH.Y) warmYellow = brightness + if (options.plan && options.plan.length) { + for (i = 0; i < ioMasks.length; i++) { + var slot = [0, 0, 0, 0] + for (j = 0; j < options.plan.length; j++) { + var p = options.plan[j] + if ((p.mask & ioMasks[i]) === 0) continue + var off = WAVE_BYTE_OFFSET[p.wave] + if (off === undefined) continue + slot[off] = clampTreat(p.brightness === undefined ? 200 : p.brightness) + } + bytes.push(slot[0], slot[1], slot[2], slot[3], (gain >> 8) & 0xFF, gain & 0xFF) + } + } else { + var regionMask = options.region_mask || REGION.FULL_FACE + var wavelength = options.wavelength || WAVELENGTH.R + var brightness = clampTreat(options.brightness === undefined ? 200 : options.brightness) + for (i = 0; i < ioMasks.length; i++) { + var enabled = (regionMask & ioMasks[i]) !== 0 + var red = 0 + var infrared = 0 + var uv = 0 + var warmYellow = 0 + if (enabled) { + if (wavelength === WAVELENGTH.R) red = brightness + if (wavelength === WAVELENGTH.IR) infrared = brightness + if (wavelength === WAVELENGTH.UV) uv = brightness + if (wavelength === WAVELENGTH.Y) warmYellow = brightness + } + bytes.push(red, infrared, uv, warmYellow, (gain >> 8) & 0xFF, gain & 0xFF) } - bytes.push(red, infrared, uv, warmYellow, (gain >> 8) & 0xFF, gain & 0xFF) } bytes.push((holdSeconds >> 8) & 0xFF, holdSeconds & 0xFF) @@ -217,13 +249,18 @@ function parseVendorStatus(buffer) { for (var p = 0; p < 7; p++) { pds19.push(bytes[p * 2] | (bytes[p * 2 + 1] << 8)) } + // Byte17 复用：低位=贴合状态(0/1)，高三位=扫描时光色指示（0 表示无标识/非扫描态或旧固件）。 + // Byte18 运行状态：0=IDLE 1=检测 2=治疗 0xFF=故障。 + var scanWaveCode = (bytes[16] >> 5) & 0x07 return { type: 'adc', is_heartbeat: false, pd: pds19, vbat: bytes[14] | (bytes[15] << 8), - fitting: bytes[16], + fitting: bytes[16] & 0x1F, + scan_wave: SCAN_WAVE_KEY[scanWaveCode] || null, run_state: bytes[17], + is_fault: bytes[17] === 0xFF, checksum_ok: checksum19 === bytes[18], raw_hex: bytesToHex(bytes) } @@ -326,11 +363,13 @@ function parseException(payload) { // --- display helpers --- +// 掩码 = IO 纵列布局（与 REGION 常量一致）。注意：此处为硬编码中文（历史遗留， +// history/treatment-done 在用）；新页面请改用 i18n common.regions.* 取标签。 function getRegionName(mask) { var names = [] var bits = [ - [0x01, '右区'], [0x02, '左区'], [0x04, '上区'], - [0x08, '中区'], [0x10, '下区'], [0x20, '左上区'], [0x40, '右上区'] + [0x01, '左区'], [0x02, '中上区'], [0x04, '中区'], + [0x08, '中下区'], [0x10, '右区'] ] for (var i = 0; i < bits.length; i++) { if (mask & bits[i][0]) names.push(bits[i][1]) @@ -362,6 +401,7 @@ module.exports = { TREAT_MODE: TREAT_MODE, REGION: REGION, REGION_NAMES: REGION_NAMES, + SCAN_WAVE_KEY: SCAN_WAVE_KEY, CONTROL: CONTROL, DEVICE_ERR: DEVICE_ERR, diff --git a/miniprogram/services/diagnosis.js b/miniprogram/services/diagnosis.js index 48c4a50..038088e 100644 --- a/miniprogram/services/diagnosis.js +++ b/miniprogram/services/diagnosis.js @@ -1,130 +1,165 @@ -// Skin-tendency diagnosis — FRAMEWORK / placeholder implementation. +// Skin-tendency diagnosis — 按《扫描+护理完整流程.docx》7.1/7.2/7.3 + +// 《协议简述-添加扫描时光色.docx》+ 果果 2026-07 定案实现。 // -// STATUS: the diagnosis 依据 is NOT yet calibrated (客户也认为"还只是概念"). -// This module defines the full data pipeline so the report UI + storage work end -// to end today, but the thresholds and the PD->region mapping are PLACEHOLDERS to -// be replaced after real-device calibration. It degrades gracefully when only -// partial scan data (currently single-wavelength red) is available. +// 核心链路：28 组 PD(4 波长×7 路) → 按 PD_REGION_MAP 聚合成 5 区 → +// 每波长算 5 区平均当基准 → 吸收度 NR = 本区/基准 − 1 → +// 每区取 4 个 NR 的最大者(argmax)，超过阈值 TH 才判定问题 → 该波长即该区治疗光色。 // -// Two things here need hardware/calibration confirmation before this is "real": -// 1) PD_REGION_MAP — which of the 7 PDs feed which facial region (docs disagree). -// 2) levels thresholds — normalized-absorption cutoffs per severity level. -// Both can be overridden at runtime by the server-side diagnosis_config, so tuning -// after calibration does NOT require an app release. +// 极性（已由固件批注版文档坐实，新版协议简述再次确认"0x0FFF表示最低光照"）： +// PD ADC 值越大 = 反射光越弱 = 皮肤吸收越多。故 NR = zone/avg − 1（吸收多→NR 高）。 +// config.polarity = 'direct' 可切回"值大=光强"的旧假设（备用开关，标定时救急）。 +// +// 仍未确认（走 config 热调，勿写死）： +// 1) PD_REGION_MAP —— 7 路 PD 与 5 区的物理对应，所有文档从未给出，当前为推测值。 +// 2) 3 路 PD 区的聚合 —— 文档 7.1 自相矛盾(几何平均 vs 取最小)，按更细的几何平均+3σ剔异常实现。 +// 所有阈值/亮度/映射均可被服务端 diagnosis_config 覆盖，标定后免发版调参。 -// Problem type -> recommended care wavelength (IR=1, R=2, UV=3, Y=4). +// 问题类型 -> 治疗波长编码（下发命令用：IR=1, R=2, UV=3, Y=4）。 var PROBLEM_WAVELENGTH = { aging: 2, acne: 3, pigment: 4, deep: 1 } -// Scanned wavelength code -> the problem it reveals (inverse of the above). -var WAVELENGTH_PROBLEM = { 1: 'deep', 2: 'aging', 3: 'acne', 4: 'pigment' } -// Dictionary wave-key -> wavelength code. +// 波长 key -> 揭示的问题类型。 +var WAVE_PROBLEM = { red: 'aging', uv: 'acne', yellow: 'pigment', ir: 'deep' } +// 波长 key -> 下发命令编码。 var WAVE_KEY_CODE = { red: 2, uv: 3, yellow: 4, ir: 1 } -// 5 regions in the app's neutral convention (right/left/top/middle/bottom), -// matching treatment-setup.js masks. +// 5 区 = IO 纵列布局（果果定案）：左=IO1 中上=IO2 中=IO3 中下=IO4 右=IO5。 var REGION_DEFS = [ - { key: 'right', mask: 0x01 }, - { key: 'left', mask: 0x02 }, - { key: 'top', mask: 0x04 }, - { key: 'middle', mask: 0x08 }, - { key: 'bottom', mask: 0x10 } + { key: 'left', mask: 0x01 }, + { key: 'top', mask: 0x02 }, + { key: 'middle', mask: 0x04 }, + { key: 'bottom', mask: 0x08 }, + { key: 'right', mask: 0x10 } ] -// PLACEHOLDER PD->region map. Flow doc: 7 PDs = 1 special region (3 PDs) + 4 regions -// (1 PD each). The exact assignment is UNCONFIRMED — replace after hardware confirms -// the PD physical layout. Each region lists the PD index(es) that feed its signal. -var PD_REGION_MAP = { - right: [0], left: [1], top: [2], middle: [3, 5, 6], bottom: [4] -} - -var MAX_ADC = 4095 - var DEFAULT_CONFIG = { calibrated: false, - levels: { low: 0.15, mid: 0.35, high: 0.55 }, + polarity: 'inverted', // inverted=值大吸收多(已确认) | direct=旧假设备用 + th: 0.10, // 判定阈值(文档建议初始值，需临床标定) + severity: { low: 0.05, mid: 0.15, high: 0.30 }, // 轻/中/重分级，仅报告展示 + brightness: 204, // 治疗强度 80%(果果定案)，仅用于推荐方案下发 + // 推测映射：中区含 3 路 PD(文档"1 特殊区 3 路+4 普通区各 1 路")，待固件确认后改 config。 + pd_region_map: { left: [0], top: [1], middle: [2, 3, 4], bottom: [5], right: [6] }, problem_wavelength: PROBLEM_WAVELENGTH } -function _avg(arr) { - if (!arr || !arr.length) return 0 - var s = 0 - for (var i = 0; i < arr.length; i++) s += arr[i] - return s / arr.length +function _median(arr) { + var s = arr.slice().sort(function (a, b) { return a - b }) + var m = Math.floor(s.length / 2) + return s.length % 2 ? s[m] : (s[m - 1] + s[m]) / 2 } -// Normalized absorption in [0,1]: the more the light is absorbed (lower reflected PD -// relative to the底噪 baseline), the stronger the tendency signal. -function _absorption(pdValue, baseline) { - if (!baseline || baseline <= 0) return 0 - var a = (baseline - pdValue) / baseline - if (a < 0) a = 0 - if (a > 1) a = 1 - return a +// 区域有效值：1 路直接用；≥3 路按 7.1 节"几何平均 + 剔奇异值"（防黑痣/毛发单点失真）。 +// 剔异常用 MAD(中位数绝对偏差)而非文档字面的 3σ：n=3 时单个离群点会把标准差同步撑大， +// 3σ 判据永不触发（审计实证 [900,9000,905] 不剔）；MAD 阈值 4.45×MAD ≈ 3σ 等效(3×1.4826)。 +function _aggregate(vals) { + if (!vals.length) return 0 + if (vals.length === 1) return vals[0] + var kept = vals + if (vals.length >= 3) { + var med = _median(vals) + var devs = vals.map(function (v) { return Math.abs(v - med) }) + var mad = _median(devs) + var thr = 4.45 * mad + var filtered = vals.filter(function (v) { return Math.abs(v - med) <= thr }) + if (filtered.length >= 2) kept = filtered + } + var logSum = 0 + for (var i = 0; i < kept.length; i++) { + if (kept[i] <= 0) return 0 // 有无效 0 值时该区数据不可信 + logSum += Math.log(kept[i]) + } + return Math.exp(logSum / kept.length) } -function _levelOf(score, levels) { - if (score >= levels.high) return 3 - if (score >= levels.mid) return 2 - if (score >= levels.low) return 1 +function _severityLevel(nr, severity) { + if (nr > severity.high) return 3 + if (nr > severity.mid) return 2 + if (nr > severity.low) return 1 return 0 } // scanData: { // device_id, scanned_at, -// region_mask, // which regions were scanned (default 0x1F) -// noise: [7], // per-PD 底噪 baseline (optional; defaults MAX_ADC) -// waves: { red:[7], uv:[7], yellow:[7], ir:[7] } // any subset; each = 7 PD values +// region_mask, // 本次扫描选中的区域(默认 0x1F) +// waves: { red:[7], ir:[7], uv:[7], yellow:[7] } // 任意子集；每项 = 7 路 PD ADC // } function analyze(scanData, config) { config = config || DEFAULT_CONFIG - var levels = config.levels || DEFAULT_CONFIG.levels + var th = config.th !== undefined ? config.th : DEFAULT_CONFIG.th + var severity = config.severity || DEFAULT_CONFIG.severity + var brightness = config.brightness || DEFAULT_CONFIG.brightness + var pdMap = config.pd_region_map || DEFAULT_CONFIG.pd_region_map var problemWave = config.problem_wavelength || PROBLEM_WAVELENGTH + var inverted = config.polarity !== 'direct' scanData = scanData || {} var waves = scanData.waves || {} - var noise = scanData.noise var scannedMask = scanData.region_mask || 0x1F + // 1) 聚合：每波长 × 每选中区 → 区域有效值 + var zone = {} // zone[waveKey][regionKey] = 有效值 + var included = [] // 参与本次扫描的区域定义 + var r, def + for (r = 0; r < REGION_DEFS.length; r++) { + if ((scannedMask & REGION_DEFS[r].mask) !== 0) included.push(REGION_DEFS[r]) + } + for (var wk in waves) { + if (!waves.hasOwnProperty(wk) || !WAVE_PROBLEM[wk]) continue + var pdArr = waves[wk] + if (!pdArr || !pdArr.length) continue + zone[wk] = {} + for (r = 0; r < included.length; r++) { + def = included[r] + var idxs = pdMap[def.key] || [] + var vals = [] + for (var k = 0; k < idxs.length; k++) { + var v = pdArr[idxs[k]] + if (v !== undefined && v !== null && v > 0) vals.push(v) + } + if (vals.length) zone[wk][def.key] = _aggregate(vals) + } + } + + // 2) 每波长的基准 = 该波长下各区有效值的平均（7.1：Avg_PD_X_AllZones） + var avg = {} + for (wk in zone) { + if (!zone.hasOwnProperty(wk)) continue + var sum = 0 + var n = 0 + for (r = 0; r < included.length; r++) { + var zv = zone[wk][included[r].key] + if (zv !== undefined) { sum += zv; n++ } + } + if (n > 0) avg[wk] = sum / n + } + + // 3) 吸收度 NR + 每区 argmax 判定 var regions = [] var overallAcc = {} - - for (var r = 0; r < REGION_DEFS.length; r++) { - var def = REGION_DEFS[r] - if ((scannedMask & def.mask) === 0) continue - var pdIdx = PD_REGION_MAP[def.key] || [] - var problems = [] - - for (var wk in waves) { - if (!waves.hasOwnProperty(wk)) continue - var code = WAVE_KEY_CODE[wk] - var problemType = WAVELENGTH_PROBLEM[code] - if (!problemType) continue - - var pdVals = [] - var baseVals = [] - for (var k = 0; k < pdIdx.length; k++) { - var idx = pdIdx[k] - if (waves[wk][idx] !== undefined) pdVals.push(waves[wk][idx]) - baseVals.push(noise && noise[idx] !== undefined ? noise[idx] : MAX_ADC) - } - if (!pdVals.length) continue - - var score = _absorption(_avg(pdVals), _avg(baseVals)) - var level = _levelOf(score, levels) - if (level > 0) { - problems.push({ type: problemType, level: level, score: Math.round(score * 100) / 100 }) - if (!overallAcc[problemType] || level > overallAcc[problemType]) { - overallAcc[problemType] = level - } - } + for (r = 0; r < included.length; r++) { + def = included[r] + var nrs = [] // 该区所有可算波长的 {wave, nr} + for (wk in zone) { + if (!zone.hasOwnProperty(wk)) continue + if (zone[wk][def.key] === undefined || !avg[wk]) continue + var ratio = zone[wk][def.key] / avg[wk] + var nr = inverted ? (ratio - 1) : (1 - ratio) + nrs.push({ wave: wk, nr: Math.round(nr * 1000) / 1000 }) + } + nrs.sort(function (a, b) { return b.nr - a.nr }) + var top = nrs.length ? nrs[0] : null + var hasProblem = !!(top && top.nr > th) + var problemType = hasProblem ? WAVE_PROBLEM[top.wave] : null + var level = hasProblem ? Math.max(1, _severityLevel(top.nr, severity)) : 0 + if (problemType && (!overallAcc[problemType] || level > overallAcc[problemType])) { + overallAcc[problemType] = level } - - problems.sort(function (a, b) { return (b.level - a.level) || (b.score - a.score) }) - var top = problems.length ? problems[0] : null regions.push({ region: def.key, mask: def.mask, - top_problem: top ? top.type : null, - level: top ? top.level : 0, - problems: problems + top_problem: problemType, + wave: hasProblem ? top.wave : null, + level: level, + score: top ? top.nr : 0, + nrs: nrs // 全量吸收度，供标定期回看 }) } @@ -134,23 +169,22 @@ function analyze(scanData, config) { } overall.sort(function (a, b) { return b.level - a.level }) - // Recommendation: care each region-with-a-top-problem using that problem's wavelength. - // One BLE command carries one wavelength, so plan entries are grouped by wavelength. - var planByWave = {} - var recommendMask = 0 - for (var i = 0; i < regions.length; i++) { - var reg = regions[i] - if (!reg.top_problem) continue - var wl = problemWave[reg.top_problem] - if (!wl) continue - planByWave[wl] = (planByWave[wl] || 0) | reg.mask - recommendMask |= reg.mask - } + // 4) 推荐方案：每个问题区一条（区独立、可不同色），一条 BLE 命令即可全部下发。 var recommendPlan = [] - for (var w in planByWave) { - if (!planByWave.hasOwnProperty(w)) continue - var code2 = parseInt(w, 10) - recommendPlan.push({ wavelength: code2, mask: planByWave[w], label_key: WAVELENGTH_PROBLEM[code2] }) + var recommendMask = 0 + for (r = 0; r < regions.length; r++) { + var reg = regions[r] + if (!reg.top_problem || !reg.wave) continue + recommendPlan.push({ + region: reg.region, + mask: reg.mask, + wave: reg.wave, + wavelength: WAVE_KEY_CODE[reg.wave], + label_key: reg.top_problem, + level: reg.level, + brightness: brightness + }) + recommendMask |= reg.mask } return { @@ -165,30 +199,30 @@ function analyze(scanData, config) { } } -// Adapt the current (single-wavelength red) auto-scan result into scanData, so the -// pipeline works today. pdAvg = 7 averaged PD values under red light. -function fromRedScan(pdAvg, regionMask, deviceId, scannedAt, noise) { +// 把 auto-scan 按波长分桶后的平均值组装成 scanData。 +// buckets: { red:[7], ir:[7], uv:[7], yellow:[7] } 任意子集（旧固件无波长标识时只有 red）。 +function buildScanData(buckets, regionMask, deviceId, scannedAt) { return { device_id: deviceId || null, scanned_at: scannedAt || 0, region_mask: regionMask || 0x1F, - noise: noise || null, - waves: { red: (pdAvg || []).slice(0, 7) } + waves: buckets || {} } } -// Deterministic mock report for UI development / demo when there is no device data. +// 无设备数据时的演示报告（开发者工具 mock）。 +// 数值按已确认极性编造：值大=吸收多 → 左区红光偏高(光老化)、中区紫外偏高(痘痘油脂)。 function mockReport() { return analyze({ device_id: 'MOCK', scanned_at: 0, region_mask: 0x1F, - noise: [4000, 4000, 4000, 4000, 4000, 4000, 4000], waves: { - red: [3500, 3600, 1900, 3400, 3450, 3500, 3500], - uv: [3700, 3750, 3600, 1700, 3700, 1800, 1900], - yellow: [3500, 3550, 3400, 3450, 2300, 3500, 3520], - ir: [3600, 3600, 3550, 3580, 3560, 3600, 3600] + // 左 中上 中(3路) 中下 右 + red: [1350, 920, 900, 910, 905, 890, 940], + uv: [2050, 2020, 2600, 2560, 2620, 1990, 2080], + yellow: [1500, 1520, 1490, 1505, 1495, 1530, 1510], + ir: [1800, 1790, 1805, 1795, 1800, 1815, 1790] } }, DEFAULT_CONFIG) } @@ -196,9 +230,10 @@ function mockReport() { module.exports = { DEFAULT_CONFIG: DEFAULT_CONFIG, PROBLEM_WAVELENGTH: PROBLEM_WAVELENGTH, - WAVELENGTH_PROBLEM: WAVELENGTH_PROBLEM, + WAVE_PROBLEM: WAVE_PROBLEM, + WAVE_KEY_CODE: WAVE_KEY_CODE, REGION_DEFS: REGION_DEFS, analyze: analyze, - fromRedScan: fromRedScan, + buildScanData: buildScanData, mockReport: mockReport } diff --git a/server/sql/schema.sql b/server/sql/schema.sql index 1ada10b..5e9f5b1 100644 --- a/server/sql/schema.sql +++ b/server/sql/schema.sql @@ -204,4 +204,4 @@ INSERT IGNORE INTO system_settings (setting_key, setting_value) VALUES ('enable_binding', 'true'), ('enable_free_mode', 'true'), ('maintenance_mode', 'false'), -('diagnosis_config', '{"calibrated": false, "note": "占位阈值，待真机标定后调整", "levels": {"low": 0.15, "mid": 0.35, "high": 0.55}, "problem_wavelength": {"aging": 2, "acne": 3, "pigment": 4, "deep": 1}}'); +('diagnosis_config', '{"calibrated": false, "note": "阈值/PD映射为待标定初始值(文档建议值+推测映射)；polarity=inverted 已由固件确认(PD值大=吸收多)；pd_region_map 待固件给出 PD1~7 实际排布后修正", "polarity": "inverted", "th": 0.10, "severity": {"low": 0.05, "mid": 0.15, "high": 0.30}, "brightness": 204, "pd_region_map": {"left": [0], "top": [1], "middle": [2, 3, 4], "bottom": [5], "right": [6]}, "problem_wavelength": {"aging": 2, "acne": 3, "pigment": 4, "deep": 1}}');