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键
这个提交包含在:
@@ -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 () {
|
||||
|
||||
@@ -30,6 +30,64 @@
|
||||
<view class="empty-hint" wx:else>{{i18n.report.noProblem}}</view>
|
||||
</view>
|
||||
|
||||
<!-- Face zones -->
|
||||
<view class="card">
|
||||
<view class="card-title">{{i18n.report.faceTitle}}</view>
|
||||
<view class="face-map">
|
||||
<view class="face-col face-col-side">
|
||||
<view class="face-zone {{faceZones[0].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[0].waveKey}}">
|
||||
<text class="face-zone-name">{{faceZones[0].name}}</text>
|
||||
<text class="face-zone-mode" wx:if="{{faceZones[0].hasProblem}}">{{faceZones[0].modeLabel}}</text>
|
||||
<text class="face-zone-level" wx:if="{{faceZones[0].hasProblem}}">{{faceZones[0].levelLabel}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="face-col face-col-mid">
|
||||
<view class="face-zone {{faceZones[1].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[1].waveKey}}">
|
||||
<text class="face-zone-name">{{faceZones[1].name}}</text>
|
||||
<text class="face-zone-mode" wx:if="{{faceZones[1].hasProblem}}">{{faceZones[1].modeLabel}}</text>
|
||||
<text class="face-zone-level" wx:if="{{faceZones[1].hasProblem}}">{{faceZones[1].levelLabel}}</text>
|
||||
</view>
|
||||
<view class="face-zone {{faceZones[2].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[2].waveKey}}">
|
||||
<text class="face-zone-name">{{faceZones[2].name}}</text>
|
||||
<text class="face-zone-mode" wx:if="{{faceZones[2].hasProblem}}">{{faceZones[2].modeLabel}}</text>
|
||||
<text class="face-zone-level" wx:if="{{faceZones[2].hasProblem}}">{{faceZones[2].levelLabel}}</text>
|
||||
</view>
|
||||
<view class="face-zone {{faceZones[3].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[3].waveKey}}">
|
||||
<text class="face-zone-name">{{faceZones[3].name}}</text>
|
||||
<text class="face-zone-mode" wx:if="{{faceZones[3].hasProblem}}">{{faceZones[3].modeLabel}}</text>
|
||||
<text class="face-zone-level" wx:if="{{faceZones[3].hasProblem}}">{{faceZones[3].levelLabel}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="face-col face-col-side">
|
||||
<view class="face-zone {{faceZones[4].colorClass}}" bindtap="onTapZone" data-wave="{{faceZones[4].waveKey}}">
|
||||
<text class="face-zone-name">{{faceZones[4].name}}</text>
|
||||
<text class="face-zone-mode" wx:if="{{faceZones[4].hasProblem}}">{{faceZones[4].modeLabel}}</text>
|
||||
<text class="face-zone-level" wx:if="{{faceZones[4].hasProblem}}">{{faceZones[4].levelLabel}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="face-legend">
|
||||
<view class="legend-item">
|
||||
<view class="legend-dot zone-red"></view>
|
||||
<text class="legend-label">{{i18n.report.modeNames.red}}</text>
|
||||
</view>
|
||||
<view class="legend-item">
|
||||
<view class="legend-dot zone-ir"></view>
|
||||
<text class="legend-label">{{i18n.report.modeNames.ir}}</text>
|
||||
</view>
|
||||
<view class="legend-item">
|
||||
<view class="legend-dot zone-uv"></view>
|
||||
<text class="legend-label">{{i18n.report.modeNames.uv}}</text>
|
||||
</view>
|
||||
<view class="legend-item">
|
||||
<view class="legend-dot zone-yellow"></view>
|
||||
<text class="legend-label">{{i18n.report.modeNames.yellow}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="face-tap-hint">{{i18n.report.faceTapHint}}</view>
|
||||
<view class="face-all-normal-hint" wx:if="{{!hasProblem}}">{{i18n.report.allNormalHint}}</view>
|
||||
</view>
|
||||
|
||||
<!-- Per-region -->
|
||||
<view class="card">
|
||||
<view class="card-title">{{i18n.report.regionTitle}}</view>
|
||||
@@ -48,7 +106,7 @@
|
||||
<view class="rec-row" wx:for="{{recommendList}}" wx:key="mask">
|
||||
<view class="rec-dot"></view>
|
||||
<view class="rec-body">
|
||||
<text class="rec-label">{{item.label}}</text>
|
||||
<text class="rec-label">{{item.modeLabel}}</text>
|
||||
<text class="rec-meta">{{item.wavelengthLabel}} · {{item.regionsLabel}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -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;
|
||||
|
||||
在新工单中引用
屏蔽一个用户