From 583fcb7e3dd2df373978be058bc97daed2d7423b Mon Sep 17 00:00:00 2001
From: Guoguo <i@qwq.trade>
Date: Mon, 11 May 2026 21:14:15 +0800
Subject: [PATCH] feat: add user deactivation and vendor BLE protocol

---
 .gitignore                                 |   1 +
 admin-console/src/styles/common.css        |   8 ++
 admin-console/src/views/UserDetailView.vue | 114 ++++++++++++++++-
 admin-console/src/views/UserListView.vue   |  17 ++-
 docs/README.md                             |   2 +
 docs/design/01-BLE通信协议明细.md          |  30 +++++
 docs/protocols/BLE协议冲突与问题清单.md    | 137 +++++++++++++++++++++
 docs/protocols/协议简述-补充解析.md        | 109 ++++++++++++++++
 docs/protocols/协议简述.docx               | Bin 0 -> 15941 bytes
 miniprogram/scripts/test-ble-frame.js      |  16 +++
 miniprogram/services/ble/commands.js       |  56 +++++++++
 miniprogram/services/ble/connection.js     | 115 ++++++++++-------
 miniprogram/services/ble/index.js          |   3 +
 miniprogram/services/ble/protocol.js       |  69 ++++++++++-
 server/src/dao/user.dao.js                 |  42 ++++++-
 server/src/routes/admin.js                 |  31 +++++
 16 files changed, 698 insertions(+), 52 deletions(-)
 create mode 100644 docs/protocols/BLE协议冲突与问题清单.md
 create mode 100644 docs/protocols/协议简述-补充解析.md
 create mode 100644 docs/protocols/协议简述.docx

diff --git a/.gitignore b/.gitignore
index d4e5149..83ff3bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ admin-console/dist/
 docs/reference/小程序及后台管理软件开发资料/
 软件系统说明.docx
 *.docx
+!docs/protocols/协议简述.docx
 cloud/sql/
diff --git a/admin-console/src/styles/common.css b/admin-console/src/styles/common.css
index ab957c7..b846592 100644
--- a/admin-console/src/styles/common.css
+++ b/admin-console/src/styles/common.css
@@ -84,6 +84,14 @@
   cursor: pointer;
 }
 
+.btn-danger {
+  background: #ff4d4f;
+  color: #fff;
+  border: none;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
 .btn-sm {
   height: 32px;
   padding: 0 16px;
diff --git a/admin-console/src/views/UserDetailView.vue b/admin-console/src/views/UserDetailView.vue
index af26e0f..1d12058 100644
--- a/admin-console/src/views/UserDetailView.vue
+++ b/admin-console/src/views/UserDetailView.vue
@@ -5,6 +5,10 @@
     <view class="page-card" v-if="user">
       <view class="page-header">
         <text class="page-title">👥 用户详情 - {{ user.nickname || user.user_id }}</text>
+        <view class="header-actions">
+          <button class="btn-default btn-sm" v-if="user.devices && user.devices.length > 0" @click="onUnbindAll">解绑全部设备</button>
+          <button class="btn-danger btn-sm" v-if="user.status !== 3" @click="onDeactivate">注销用户</button>
+        </view>
       </view>
 
       <view class="user-profile">
@@ -12,7 +16,10 @@
         <view class="profile-info">
           <text class="user-name">{{ user.nickname || '-' }}</text>
           <text class="user-phone">{{ user.phone || '-' }}</text>
-          <text class="badge badge-success">{{ subStatusText(user.subscription_status) }}</text>
+          <view class="profile-badges">
+            <text :class="statusBadge(user.status)">{{ statusText(user.status) }}</text>
+            <text :class="user.subscription_status === 1 ? 'badge badge-success' : 'badge badge-default'">{{ subStatusText(user.subscription_status) }}</text>
+          </view>
         </view>
       </view>
 
@@ -35,6 +42,10 @@
     <view class="page-card" v-if="user">
       <view class="card-title">基本信息</view>
       <view class="info-grid">
+        <view class="info-item">
+          <text class="info-label">用户状态</text>
+          <text class="info-value"><text :class="statusBadge(user.status)">{{ statusText(user.status) }}</text></text>
+        </view>
         <view class="info-item">
           <text class="info-label">绑定设备</text>
           <text class="info-value">{{ user.devices && user.devices.length > 0 ? user.devices[0].device_name || user.devices[0].device_id : '无' }}</text>
@@ -54,6 +65,29 @@
       </view>
     </view>
 
+    <view class="page-card" v-if="user && user.devices && user.devices.length > 0">
+      <view class="card-title">绑定设备</view>
+      <view class="data-table">
+        <view class="t-header">
+          <view class="t-row">
+            <text class="t-th flex2">设备编号</text>
+            <text class="t-th flex2">设备名称</text>
+            <text class="t-th flex1">操作</text>
+          </view>
+        </view>
+        <view class="t-body">
+          <view class="t-row" v-for="device in user.devices" :key="device.device_id">
+            <text class="t-td flex2">{{ device.device_id }}</text>
+            <text class="t-td flex2">{{ device.device_name || '-' }}</text>
+            <text class="t-td flex1">
+              <text class="action-link" @click="onDeviceDetail(device)">详情</text>
+              <text class="action-link danger-link" @click="onUnbindDevice(device)">解绑</text>
+            </text>
+          </view>
+        </view>
+      </view>
+    </view>
+
     <view class="page-card" v-if="user && user.recent_treatments">
       <view class="card-title">护理记录</view>
       <view class="data-table">
@@ -80,7 +114,7 @@
 </template>
 
 <script>
-import { get } from '../utils/request'
+import { get, post } from '../utils/request'
 import { formatDateShort } from '../utils/format'
 
 export default {
@@ -115,6 +149,68 @@ export default {
     goRecords() {
       this.$emit('navigate', 'record', { user_id: this.userId })
     },
+    onDeviceDetail(device) {
+      this.$emit('navigate', 'device-detail', { device_id: device.device_id })
+    },
+    onUnbindDevice(device) {
+      var self = this
+      uni.showModal({
+        title: '确认解绑',
+        content: '确定要解绑设备 ' + device.device_id + ' 吗？',
+        success: async function (res) {
+          if (!res.confirm) return
+          try {
+            await post('/api/v1/admin/users/' + self.userId + '/unbind', { device_id: device.device_id })
+            uni.showToast({ title: '解绑成功', icon: 'success' })
+            self.loadUser()
+          } catch (e) {
+            uni.showToast({ title: '解绑失败', icon: 'none' })
+          }
+        }
+      })
+    },
+    onUnbindAll() {
+      var self = this
+      uni.showModal({
+        title: '确认解绑',
+        content: '确定要解绑该用户当前绑定的全部设备吗？',
+        success: async function (res) {
+          if (!res.confirm) return
+          try {
+            await post('/api/v1/admin/users/' + self.userId + '/unbind', {})
+            uni.showToast({ title: '解绑成功', icon: 'success' })
+            self.loadUser()
+          } catch (e) {
+            uni.showToast({ title: '解绑失败', icon: 'none' })
+          }
+        }
+      })
+    },
+    onDeactivate() {
+      var self = this
+      uni.showModal({
+        title: '确认注销',
+        content: '注销后该用户将无法继续登录，当前绑定设备也会被解绑。确定继续吗？',
+        success: async function (res) {
+          if (!res.confirm) return
+          try {
+            await post('/api/v1/admin/users/' + self.userId + '/deactivate', {})
+            uni.showToast({ title: '已注销', icon: 'success' })
+            self.loadUser()
+          } catch (e) {
+            uni.showToast({ title: '注销失败', icon: 'none' })
+          }
+        }
+      })
+    },
+    statusText(status) {
+      const map = { 1: '正常', 2: '禁用', 3: '已注销' }
+      return map[status] || '未知'
+    },
+    statusBadge(status) {
+      const map = { 1: 'badge badge-success', 2: 'badge badge-warning', 3: 'badge badge-error' }
+      return map[status] || 'badge badge-default'
+    },
     subStatusText(status) {
       return status === 1 ? '已订阅' : '未订阅'
     },
@@ -144,6 +240,12 @@ export default {
   margin-bottom: 20px;
 }
 
+.header-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
 .page-title {
   font-size: 18px;
   font-weight: 600;
@@ -187,7 +289,9 @@ export default {
   color: #999;
 }
 
-.badge {
+.profile-badges {
+  display: flex;
+  gap: 8px;
   margin-top: 4px;
 }
 
@@ -264,4 +368,8 @@ export default {
   font-size: 14px;
   cursor: pointer;
 }
+
+.danger-link {
+  color: #ff4d4f;
+}
 </style>
diff --git a/admin-console/src/views/UserListView.vue b/admin-console/src/views/UserListView.vue
index a4b1cbd..9ac9a1c 100644
--- a/admin-console/src/views/UserListView.vue
+++ b/admin-console/src/views/UserListView.vue
@@ -23,6 +23,7 @@
             <text class="t-th flex1">绑定设备</text>
             <text class="t-th flex1">护理次数</text>
             <text class="t-th flex1">订阅状态</text>
+            <text class="t-th flex1">用户状态</text>
             <text class="t-th flex2">注册时间</text>
             <text class="t-th flex1">操作</text>
           </view>
@@ -41,6 +42,9 @@
             <text class="t-td flex1">
               <text :class="subBadge(item.subscription_status)">{{ subStatusText(item.subscription_status) }}</text>
             </text>
+            <text class="t-td flex1">
+              <text :class="userStatusBadge(item.status)">{{ userStatusText(item.status) }}</text>
+            </text>
             <text class="t-td flex2">{{ formatDate(item.created_at) }}</text>
             <text class="t-td flex1">
               <text class="action-link" @click="onDetail(item.user_id)">详情</text>
@@ -114,15 +118,24 @@ export default {
     subBadge(status) {
       return status === 1 ? 'badge badge-success' : 'badge badge-default'
     },
+    userStatusText(status) {
+      const map = { 1: '正常', 2: '禁用', 3: '已注销' }
+      return map[status] || '未知'
+    },
+    userStatusBadge(status) {
+      const map = { 1: 'badge badge-success', 2: 'badge badge-warning', 3: 'badge badge-error' }
+      return map[status] || 'badge badge-default'
+    },
     formatDate: formatDateShort,
     async onExport() {
       try {
         const data = await get('/api/v1/admin/users', { page: 1, page_size: 9999, keyword: this.keyword })
         const records = data.records || []
         exportCSV('users_' + new Date().toISOString().slice(0, 10) + '.csv',
-          ['用户ID', '昵称', '手机号', '绑定设备数', '护理次数', '订阅状态', '注册时间'],
+          ['用户ID', '昵称', '手机号', '绑定设备数', '护理次数', '订阅状态', '用户状态', '注册时间'],
           records.map(function (r) {
-            return [r.user_id, r.nickname || '', r.phone || '', r.device_count || 0, r.treatment_count || 0, r.subscription_status === 1 ? '已订阅' : '未订阅', r.created_at ? r.created_at.slice(0, 10) : '']
+            var userStatus = { 1: '正常', 2: '禁用', 3: '已注销' }[r.status] || '未知'
+            return [r.user_id, r.nickname || '', r.phone || '', r.device_count || 0, r.treatment_count || 0, r.subscription_status === 1 ? '已订阅' : '未订阅', userStatus, r.created_at ? r.created_at.slice(0, 10) : '']
           })
         )
         uni.showToast({ title: '导出成功', icon: 'success' })
diff --git a/docs/README.md b/docs/README.md
index 392ba9f..6921ae9 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -21,6 +21,8 @@
 - `requirements/软件系统说明.docx`
 - `requirements/光子美容仪软件系统说明.docx`
 - `design/01-BLE通信协议明细.md`
+- `protocols/BLE协议冲突与问题清单.md`
+- `protocols/协议简述-补充解析.md`
 - `design/02-小程序业务流程与状态机.md`
 - `planning/需求缺口清单.md`
 - `reviews/代码与设计文档对比分析.md` — 历史阶段评审，不能代表当前实现
diff --git a/docs/design/01-BLE通信协议明细.md b/docs/design/01-BLE通信协议明细.md
index af8e5be..ab5ef70 100644
--- a/docs/design/01-BLE通信协议明细.md
+++ b/docs/design/01-BLE通信协议明细.md
@@ -14,6 +14,36 @@
   - `FFE2`：OTA 升级服务
 - 业务流程中至少存在以下设备交互阶段：连接设备、确认佩戴、自动扫描、开始治疗
 
+## 供应商补充协议摘录（2026-05-11）
+
+根目录新增的 `协议简述.docx` 已归档到 `docs/protocols/协议简述.docx`，解析稿见 `docs/protocols/协议简述-补充解析.md`。
+
+补充文档主要给出 `FFE1` 数据通信相关信息：
+
+| UUID/字段 | 名称 | 属性/说明 |
+| --- | --- | --- |
+| `FFE1` | 数据通信服务 / Command | 文档中同时写作服务和 Command，`Write+Read`，下发控制指令 |
+| `FFE4` | Status | `Read + Notify`，设备状态及 ADC 值数据上报 |
+
+Command 参数区被描述为 33 字节：
+
+- IO1-IO5，每个 IO 含 4 个光强字段：红灯、红外、紫外、暖黄
+- IO1-IO5，每个 IO 含 2 字节电流增益
+- Byte31-Byte32：保持时间高/低字节
+- Byte33：异或校验
+
+### 与当前实现的关键差异
+
+由于项目当前优先目标是尽快跑通真机，新补充协议先作为当前执行协议：`FFE1` 写 Command，`FFE4` 订阅 Status，Command 直接写 33 字节参数块。旧 `0xAA 0x55 | length | type | payload | XOR checksum` 帧协议暂作为历史参考和后续兼容方案保留。
+
+需要硬件侧优先确认：
+
+1. `FFE1`、`FFE4`、`FFE5` 的最终服务/特征分配。
+2. Command 写入是否为裸 33 字节，还是仍需现有帧封装。
+3. Byte33 XOR 的计算范围。
+4. Byte31-Byte32 保持时间单位和字节序。
+5. Status/ADC 上报的完整字节布局。
+
 ## 帧结构草案
 
 ### 帧总体格式
diff --git a/docs/protocols/BLE协议冲突与问题清单.md b/docs/protocols/BLE协议冲突与问题清单.md
new file mode 100644
index 0000000..71df06d
--- /dev/null
+++ b/docs/protocols/BLE协议冲突与问题清单.md
@@ -0,0 +1,137 @@
+# BLE 协议冲突与问题清单
+
+更新时间：2026-05-11
+
+## 结论
+
+当前补充协议与旧 BLE 协议、原小程序实现存在实质冲突。由于项目当前优先目标是尽快真机跑通，执行口径调整为：**先以新补充协议为准，旧协议作为历史参考和后续逐步补齐的扩展协议**。
+
+小程序已先接入新协议的最小可跑通路径：`FFE1` 数据通信服务 / Command 写入，`FFE4` Status 订阅，Command 直接写 33 字节参数块。旧协议中的 `0xAA 0x55 | length | type | payload | XOR checksum` 帧结构暂时保留在代码中，但不作为当前治疗参数下发主路径。
+
+新补充的 `协议简述.docx` 仍然缺少绑定、停止、查询、ACK、Status/ADC 完整字节表等内容；这些不再阻塞首轮跑通，但会影响后续完整交互和状态展示，需要继续补齐。
+
+## 资料来源
+
+| 来源 | 当前用途 | 说明 |
+| --- | --- | --- |
+| `docs/protocols/通信协议_小程序与光子美容仪设备.docx` | 旧 BLE 协议来源 | 现有 BLE 代码和架构文档主要基于此协议 |
+| `docs/protocols/协议简述.docx` | 供应商补充协议 | 2026-05-11 归档，内容较短，主要描述 33 字节 Command 和 Status notify |
+| `docs/protocols/协议简述-补充解析.md` | 补充协议解析稿 | 已抽取补充协议中的 UUID、特征、33 字节字段 |
+| `miniprogram/services/ble/protocol.js` | 当前实现 | 新协议优先：`PROTOCOL_MODE = vendor_33`，生成 33 字节 Command |
+| `miniprogram/services/ble/commands.js` | 当前实现 | `setParams()` 直接写 33 字节；旧命令保留为后续兼容 |
+| `miniprogram/services/ble/connection.js` | 当前实现 | 发现 `FFE1` command，订阅 `FFE4` status |
+
+## P0 阻塞问题
+
+这些问题不解决，真机 BLE 联调大概率不通。
+
+| 问题 | 旧协议/当前代码 | 补充协议 | 影响 |
+| --- | --- | --- | --- |
+| UUID 分配冲突 | `FFE1` 是数据通信服务，`FFE4` 是 Command，`FFE5` 是 Status | `FFE1` 同时写作数据通信服务和 Command，`FFE4` 是 Status | 小程序可能写错 characteristic，也可能订阅错 notify |
+| Command 写入格式冲突 | 写入完整帧：`0xAA55 + length + type + payload + checksum` | 只描述 33 字节 Command 参数块 | 如果固件只收裸 33 字节，当前写入会被拒绝；如果固件收旧帧，按补充协议改也会失败 |
+| 命令字机制缺失 | 有 `0x01` 设置参数、`0x02` 启动、`0x03` 停止、`0x04` 查询、`0x05` 绑定、`0x06` 解绑 | 未出现命令 type | 无法判断 33 字节是“设置参数”还是“设置并启动”，也无法覆盖停止/查询/绑定 |
+| ACK 机制冲突 | 每次写命令会等待 `0x22 ACK`，5 秒超时后失败 | 未说明 ACK/NACK | 即使设备执行了命令，只要不回 ACK，小程序仍会判定失败并重试 |
+| Status notify 格式缺失 | 当前解析 `0x21 STATUS_REPORT` 的 14 字节 payload | 只写“设备状态及 ADC 值，Read + Notify” | 小程序无法正确解析设备状态、电量、温度、ADC 或错误码 |
+| 校验规则不一致 | 当前 XOR 覆盖帧头、长度、type、payload | Byte33 是异或校验，但未写范围 | 校验范围不同会导致设备丢包或小程序丢通知 |
+
+## P1 高风险不一致
+
+这些问题不一定让连接失败，但会让参数含义、治疗流程或数据记录出错。
+
+| 问题 | 当前实现 | 补充协议/文档缺口 | 风险 |
+| --- | --- | --- | --- |
+| 治疗参数模型不同 | `region_mask + wavelength + brightness + duration_ms + mode` | IO1-IO5 各自包含红灯、红外、紫外、暖黄光强和电流增益 | 当前 UI 和协议无法表达每个 IO 的独立光强/电流 |
+| 时间字段不同 | `duration_ms` 为 4 字节大端毫秒 | Byte31-32 为保持时间高/低字节 | 单位、范围和字节序不明，可能导致治疗时长错误 |
+| IO 与面部区域无映射 | 当前用 7 个区域 bit：左脸、右脸、额头、下巴、鼻部、左眼、右眼 | 只定义 IO1-IO5 | 无法从小程序区域选择稳定生成 IO 参数 |
+| 光强取值范围不明 | 当前 brightness 默认 200，波长单选 | 四种灯光每个 IO 一个强度 | 不知道是 0-100、0-255、PWM、DAC 还是其他单位 |
+| 电流增益定义不明 | 当前没有电流增益字段 | 每个 IO 2 字节电流增益 | 不知道单位、范围、字节序和安全上限 |
+| 启动/停止语义不明 | `SET_PARAMS` 后还会发 `START`，停止发 `STOP` | 补充协议只描述 Command 参数块 | 如果写 33 字节会立即启动，当前双命令流程不适用；如果不会启动，还缺 START 定义 |
+| 绑定命令长度疑似错误 | 架构文档写 `userId(8B)`，代码实际用 `uint32ToBytes()` 生成 4B | 补充协议未覆盖绑定 | 绑定流程可能与固件预期不一致，需要单独确认 |
+
+## P2 文档和实现需要收敛的问题
+
+| 问题 | 当前状态 | 建议 |
+| --- | --- | --- |
+| 权威协议未指定 | 旧协议、架构文档、补充协议并存 | 明确“最终以哪一份为准”，或把补充协议定义为旧协议的某个命令 payload |
+| `FFE1` 被同时当服务和特征 | 补充协议中表述冲突 | 要求供应商给出完整 GATT 表：service UUID、characteristic UUID、properties |
+| Status/ADC 字节表缺失 | 只有功能描述，无字段定义 | 补齐每个字节的含义、长度、单位、字节序和上报频率 |
+| 错误码缺失 | 当前代码有 `0x00-0x0C` 错误码 | 确认固件是否实现这些错误码，或给出新错误码表 |
+| 分包/MTU 未定义 | 当前默认一条写入就是完整命令 | 33 字节裸包可能超过默认 20 字节 BLE payload，需要确认 MTU 或分包策略 |
+| OTA 未受补充协议覆盖 | 当前旧协议包含 OTA 特征 | 补充协议没有 OTA 说明 | OTA 是否仍按旧协议，需要确认 |
+
+## 对当前代码的具体影响
+
+### `protocol.js`
+
+- `SERVICE.DATA_COMM = FFE1` 与补充协议的 `FFE1 Command` 表述冲突。
+- `CHAR.COMMAND = FFE4` 与补充协议的 `FFE4 Status` 冲突。
+- `CHAR.STATUS = FFE5` 在补充协议中未出现。
+- `buildFrame()` 固定生成 `0xAA55` 帧，无法生成补充协议的裸 33 字节 Command。
+- `parseFrame()` 只接受 `0xAA55` 帧，无法解析补充协议可能上报的裸 Status/ADC 数据。
+- `parseStatusReport()` 固定要求 14 字节旧格式，与补充协议的 ADC 上报不匹配。
+
+### `commands.js`
+
+- `writeCommand()` 每次自动追加 `seq` 并等待 ACK；补充协议没有 `seq` 和 ACK。
+- `setParams()` 只能下发单一波长、全局亮度和全局时长，无法生成 IO1-IO5 的 33 字节参数矩阵。
+- `startTreatment()`、`stopTreatment()`、`queryStatus()`、`bindDevice()`、`unbindDevice()` 都依赖旧命令字；补充协议没有对应定义。
+- `bindDevice()` 目前把 `userId` 编成 4 字节，但旧架构文档写的是 8 字节，存在独立的实现疑点。
+
+### `connection.js`
+
+- 发现特征时会把 `FFE4` 当命令写入特征，把 `FFE5` 当状态通知特征。
+- 如果新固件实际用 `FFE1` 写命令、`FFE4` 发通知，当前连接后会找不到正确 command/status，或者写入/订阅目标错误。
+- notify 回调会先调用 `parseFrame()`；如果新固件直接上报 Status/ADC 裸数据，当前代码会直接丢弃。
+
+## 需要供应商/固件侧确认的问题
+
+优先级按联调阻塞程度排序：
+
+1. 最终 GATT 表：`FFE0`、`FFE1`、`FFE2`、`FFE3`、`FFE4`、`FFE5`、`FFE6`、`FFE7`、`FFE8`、`FFE9` 分别是什么，属性是 read/write/notify 哪些。
+2. Command 写入到底是旧帧格式，还是直接写 33 字节。
+3. 如果是 33 字节，是否需要分包；如果需要，分包格式是什么。
+4. Byte33 XOR 对哪些字节计算，初始值是多少，校验字节本身是否参与最终校验。
+5. 33 字节 Command 的语义：只设置参数，还是设置后立即启动。
+6. 停止、暂停、恢复、查询状态、绑定、解绑是否仍有命令；命令格式是什么。
+7. 是否需要 ACK/NACK；如果需要，ACK/NACK 的 characteristic、字节格式、错误码表是什么。
+8. Byte31-32 保持时间的单位、范围和字节序。
+9. IO1-IO5 与灯板/面部区域的对应关系。
+10. 红灯、红外、紫外、暖黄光强的取值范围、单位和安全限制。
+11. 电流增益高/低字节的单位、范围、字节序和安全限制。
+12. Status/ADC notify 的完整字节布局、上报周期和单位。
+13. 旧协议中的 `FFE5`、`FFE6`、OTA 相关特征是否还保留。
+14. 绑定流程是否由 BLE 完成；`userId` 是 4 字节还是 8 字节。
+
+## 建议处理方案
+
+### 方案 A：补充协议只是 `SET_PARAMS` 的新 payload
+
+如果供应商确认旧帧、旧 UUID、旧 ACK 都保留，只是 `0x01 SET_PARAMS` 的 payload 变成 33 字节：
+
+- 保留 `FFE1` 服务、`FFE4` command、`FFE5` status。
+- 保留 `0xAA55` 帧封装、`type`、`seq`、ACK。
+- 新增 `buildVendorCommand33()` 生成 33 字节参数块。
+- 修改 `setParams()`，让旧 UI 参数转换成 IO1-IO5 默认矩阵。
+- 补 Status/ADC 新解析逻辑。
+
+这是对当前代码影响最小的路线。
+
+### 方案 B：补充协议完全替代旧协议
+
+如果供应商确认新固件只接受 `FFE1` 裸 33 字节写入、`FFE4` 裸 Status notify：
+
+- `protocol.js` 需要新增或切换成新协议模式。
+- `connection.js` 的 command/status characteristic 发现逻辑要改。
+- `commands.js` 的 ACK、seq、旧命令字重试机制不能直接沿用。
+- 绑定、停止、查询状态、异常处理、治疗完成都需要供应商补齐协议后再实现。
+
+这个方案会影响小程序治疗主链路，不能只改一个 UUID。
+
+## 当前建议
+
+当前已经按方案 B 的最小版本推进。后续建议：
+
+1. 真机联调优先验证 `FFE1` 写入 33 字节是否能启动设备。
+2. 抓取 `FFE4` notify 原始字节，补 Status/ADC 字节表。
+3. 要求供应商补停止、查询、异常、完成、绑定这些命令是否存在。
+4. 后续再决定是否把旧 `0xAA55` 帧协议作为兼容模式保留。
diff --git a/docs/protocols/协议简述-补充解析.md b/docs/protocols/协议简述-补充解析.md
new file mode 100644
index 0000000..d3b62e4
--- /dev/null
+++ b/docs/protocols/协议简述-补充解析.md
@@ -0,0 +1,109 @@
+# 协议简述补充解析
+
+来源：仓库根目录 `协议简述.docx`，已归档到 `docs/protocols/协议简述.docx`。
+
+本文只记录该补充文档的可读内容和与当前实现的差异判断。原 DOCX 内容较短，主要描述 `FFE1` 数据通信服务下的控制/状态特征，以及一组 33 字节控制参数。
+
+## 原文抽取
+
+### 服务/功能摘要
+
+| UUID | 名称 | 说明 |
+| --- | --- | --- |
+| `FFE1` | 数据通信服务 | 控制指令 |
+| `FFE4` | 设备状态及 ADC 值 | 数据上报 |
+
+### 特征值摘要
+
+| UUID | 名称 | 属性 | 说明 |
+| --- | --- | --- | --- |
+| `FFE1` | `Command` | `Write+Read` | 下发控制指令 |
+| `FFE4` | `Status` | `Read + Notify` | 数据上报 |
+
+> 注意：补充文档将 `FFE1` 同时写作“数据通信服务”和 `Command` 特征 UUID；这与当前代码中的 `FFE1` 服务、`FFE4` 命令特征、`FFE5` 状态特征不一致，需硬件侧确认最终 UUID 分配。
+
+### Command 33 字节定义
+
+| 字节 | 含义 |
+| --- | --- |
+| Byte1 | IO1 红灯光强 |
+| Byte2 | IO1 红外灯光强 |
+| Byte3 | IO1 紫外灯光强 |
+| Byte4 | IO1 暖黄灯光强 |
+| Byte5 | IO1 电流增益高字节 |
+| Byte6 | IO1 电流增益低字节 |
+| Byte7 | IO2 红灯光强 |
+| Byte8 | IO2 红外灯光强 |
+| Byte9 | IO2 紫外灯光强 |
+| Byte10 | IO2 暖黄灯光强 |
+| Byte11 | IO2 电流增益高字节 |
+| Byte12 | IO2 电流增益低字节 |
+| Byte13 | IO3 红灯光强 |
+| Byte14 | IO3 红外灯光强 |
+| Byte15 | IO3 紫外灯光强 |
+| Byte16 | IO3 暖黄灯光强 |
+| Byte17 | IO3 电流增益高字节 |
+| Byte18 | IO3 电流增益低字节 |
+| Byte19 | IO4 红灯光强 |
+| Byte20 | IO4 红外灯光强 |
+| Byte21 | IO4 紫外灯光强 |
+| Byte22 | IO4 暖黄灯光强 |
+| Byte23 | IO4 电流增益高字节 |
+| Byte24 | IO4 电流增益低字节 |
+| Byte25 | IO5 红灯光强 |
+| Byte26 | IO5 红外灯光强 |
+| Byte27 | IO5 紫外灯光强 |
+| Byte28 | IO5 暖黄灯光强 |
+| Byte29 | IO5 电流增益高字节 |
+| Byte30 | IO5 电流增益低字节 |
+| Byte31 | 保持时间高字节 |
+| Byte32 | 保持时间低字节 |
+| Byte33 | 异或校验 |
+
+## 对当前实现的影响
+
+当前小程序 BLE 实现位于 `miniprogram/services/ble/`。它采用的是帧协议：
+
+```text
+0xAA 0x55 | length | type | payload | XOR checksum
+```
+
+并且 `setParams()` 当前下发的 payload 是：
+
+```text
+region_mask | wavelength | brightness | duration_ms(4B) | mode | seq
+```
+
+补充文档描述的 Command 更像“裸 33 字节参数块”，没有出现 `0xAA 0x55` 帧头、命令 type、seq、ACK 或 `region_mask`。当前因赶进度先以该 33 字节协议为准，旧帧协议暂作为历史兼容代码保留。
+
+主要差异如下：
+
+| 项目 | 当前代码/文档 | 补充文档 | 影响 |
+| --- | --- | --- | --- |
+| 命令写入格式 | 帧格式 `0xAA55 + length + type + payload + checksum` | 33 字节参数块 | 需要确认设备固件实际接收哪一种格式 |
+| 数据通信 UUID | `FFE1` 服务，`FFE4` 命令，`FFE5` 状态 | `FFE1` 服务/Command，`FFE4` Status | UUID 表存在冲突，需要硬件确认 |
+| 治疗参数模型 | 区域 mask + 单一波长 + 全局亮度 | IO1-IO5 各自四种灯光强度 + 电流增益 | 当前 UI/协议无法表达每个 IO 的独立参数 |
+| 时间字段 | `duration_ms` 4 字节大端毫秒 | 保持时间 2 字节 | 时间单位、范围、字节序均需确认 |
+| 状态上报 | 当前解析 14 字节状态 | 仅说明“设备状态及 ADC 值” | 需要补齐 Status 字节表，尤其 ADC 字段 |
+| 校验 | 当前 XOR 覆盖帧头/长度/type/payload | Byte33 为异或校验 | 需确认 Byte33 是否 XOR Byte1-Byte32 |
+
+## 需要补充确认的问题
+
+优先级从高到低：
+
+1. `FFE1`、`FFE4`、`FFE5` 的最终含义：哪个是服务 UUID，哪个是 Command characteristic，哪个是 Status characteristic。
+2. Command 写入时是否仍需要 `0xAA 0x55` 帧封装，还是直接写 33 字节参数块。
+3. Byte33 XOR 校验范围：是否对 Byte1-Byte32 做 XOR，初始值是否为 `0x00`。
+4. Byte31-Byte32 保持时间的单位：秒、100ms、分钟，或其他单位；以及字节序是否为高字节在前。
+5. IO1-IO5 与面部区域/灯板通道的对应关系。
+6. 红灯、红外、紫外、暖黄光强的取值范围和含义：是否为 PWM、百分比、DAC 值，范围是 `0-100` 还是 `0-255`。
+7. 电流增益高/低字节的取值范围、字节序和单位。
+8. Status/ADC 数据上报的完整字节布局：状态码、电量、温度、ADC 通道数、每通道字节序和单位。
+9. 是否存在开始、停止、查询状态、绑定等命令字；如果没有，33 字节写入是否同时承担“设置参数并启动”的语义。
+10. 是否需要 ACK/NACK；如果有，ACK 格式和错误码表是什么。
+
+## 建议后续处理
+
+- 当前已先接入 `buildVendorCommand33()`，由“区域 + 单一波长 + 全局亮度”生成 IO1-IO5 的默认 33 字节参数。
+- 旧帧协议暂保留，后续如供应商补齐旧协议或要求兼容，可再做协议模式切换。
+- 真机联调时优先抓取/打印实际写入的字节数组和 Status notify 原始数据，再补 Status/ADC 解析。
diff --git a/docs/protocols/协议简述.docx b/docs/protocols/协议简述.docx
new file mode 100644
index 0000000000000000000000000000000000000000..fdbe293287e8a7406a47626d140aedc2bbfe10f9
GIT binary patch
literal 15941
zcma)j1yo(hvNn2f2^KWCyK8WFcMYxw2<}dBcZVQ>;O_43uEAY{!y_~I-kHgN-&=pL
z1&6h%ucfNGPVcVz<fXtNU_pMhVA(DHU!VVOFmHbt0S)EtfwrIN<=@26-X1{zA@({b
zX`llN0%8XS0)qT^F#}s$Iu~oJjF?WFE(T=bvxEmEh0_p!LbPbc+?@1cj1c+A0eg&3
ztd+FO1b2^IUttew>oYW5pK63K=9^&Y^uNp7e?Z(Kf#<hZfp$#|ZuY>F>FVGjgHxr1
zxjF~1X;18tS20TZ+ksha5P!`G&j0Kd6um<_Gt%cp`@CBuJ(`}h8!&T0!SNl9Z=L|J
zOM*$%){y{?f@l>o$a?E|>jg)XV(omf{Hfq011aZB(<j7zF@L4rKzmk!3@Nr_h{R8R
zOTNbmlr%EX7ErMXBMhfc8Q9f@1I^Jd`RvP`<XBEj(n-$Mh2mwnCH4y784u;$0(I#s
z(XQHVMhTF9A4KC`tev^kN&qj;uk**1CxO)UsTUag0*hCJibs;RyB_Nf?Tdh{TUkVK
z+{a79^iSy@=KSjky<A6$crr~U&5|)D?W4CSB&r?arDGvXrTiWwdXkzTz1X@|Qw^{4
z`7G3EpF#g=3Z+{I9I-c3Xup}_-QP`N2(&l;Ws8W|Ny%;ow4gJ{^_=ZCnWaj~{84^m
zHAD#VP-jBU<xm;y*pV`%jld`p-to2W8p|VL`hXRZ*Q~QAa`HtF`r!@qa9XN_JPslX
zkX~wqBALh!s$u6SkaLWr>Kc>-3g8%{2lpC%jziSo&IMEY+MsObB*sc*pKBat3o*6Y
zAP23s@rJ^VhQxQD=Bz4Ao&v2w$OA?yAo?Lb!`FAnM+wgmL*mD{nGPWma0H={P?*}`
z_TDWYb%;Oi1<G>T4Rx_D-OluXG=}p+6T4l*$g3<nD#~<V^mxJKqXnKdt9A?40((Ix
zrO(T>hY%Q`h|Ybk)otWIkk7N1K<2_om=LA}*|iY8|E8yOnZDUMyAJdfQ#CGHWaT!a
z{UN~}8LLr$9jEo4pbXpX?vAIW)%32O$t14zaeXsZLb8B-6995D^z?*u4fjv2kGi$e
z$G&O(^iAui|IoVQX9uA5FTK~s3INj>FoVwGe&R=;K`i^S2uD+O8WHITRx=Per9?B9
za(4_kO~shMwnjGD92q3Za4($|ij6-Wz?HSvML2#^w3`eBi6E#@7Zd4iZbtSPQT>Ug
zE}5jG!j@}Dh?xvFe^n3k)1q`EV>KOO`XU>+p?l=D%MrR(U8hWp>P+@6&`QcW^K$H+
z<0vJu-v_NZb0{GWyL|=o$)#sGT$kNZ*#}@uLiT&^1XCfP!(J!So&Id;t_pP9J9?rX
z|I7$OzN&Y^Qp@;{YHaC(Uy?X9@5Ao6D;|a!0IF(r1rMXVtP6+YH<trxRHjqea&B|i
zQIf-)K_BYgeMrHJtO%}r&(Yr1;c9m$mUaPT!?JuVm`Ms`YNVGt2G0{zE&skyfswVw
zsuv5@S#LCJWy^%dvDa&``c>m5+GLkLFY17>Z@GJndJJJbll{rFMigzY`=#OsrQBHB
z_j5%>c&*rTxA#G>`RR{}bRm~&wA$Nw1CIUE)ZRNy7e<@01H^{TV1@x-+V8^8vjWnG
zDS7Y@pJ0BO@V|#T$Tt%@1MQ7|3v(1?rDa-gh%z$}5Tt*Le0FfPGXDI_!m~QV_CFfX
zR|~0LJGQ8*D|Xa|r^{63YW3{Yjw6|?Oy`hcG{oZ|x`T~x>5VvF8NH+1C0>Z%gGfwc
zgkaFQzOSwl3E9(L=_iB++X&9e+!}D-)}S+Dy1I3~^@t+(g%`PGxH>zdbN0G!ZPAw)
zAWAt;c^&!uS{UX1G97#)q01x2a|=Q+D7U4*TOLaEF-7`Pzt=GFY$%@md`HoQk$S`M
zCqszF&su3`Fs#Dw$Z+pMwp{Hi>e+9oF*&b>X*j<TIDL9&#FR8Fm|;(pB=zq6P|j1d
z4xya$N*iE25+}$k%k;q)foV{UXw<R>GYlZ3JxdT(C(6^O@Z5aEW@MQXXif&6xrZFb
z!PM6;O@c7;G6|6X(V%0y(!=7No4s-U{P9_DIP&>pT5rPg>>{i22Wti=;bq|qO&X@e
z6b2!%nq%3kY9@Lkk1^P}jnes}RmapbfP}FVwZ&sF>fPZE$$FT7+&EIm$O4hyw)PqR
zJw73`5LWsXDRmx^8h-Wi_Xl;)DQ`Ms#qG6+fE{0C=2zLC=n=iUrALiE`1EF84Nu9-
zQy|B1m|P=B$?NT7`|D%Y`b@dM2ddHKMYr(PytkIq*9eteHDGwqc7Sq58aB9t23hY2
zU$UUDAo%?yeo|AJiI?XFuSQ7pYtz=C=a^8@&SCK94`I~rg0yFy9gknGtjUZ3v+P&v
z?d6EN!yD8{dyvS~$~#{vkmxhPGK;xDm%L}wu?szfiV!G!;i`C}>-TSb1A2X4MKtj5
zCmbXb(M=@>Tb`}ItZCZ7ml7fd3E?6Jb6_K0*l_eXaP(Z*e!&kGYB>wQj9(yvxmS|w
ziU3*32qFe?Cf|eZSf%6!vvnqldV93?>(TSuqkIN11_56*rfdo%NGW+-*u-oWG#UW|
z3U$9K`3eY;9DNu`!A=yk06$U+sOfi?yxqpclzr{EwD~kB8n)#dauDY<pthbkBEs2C
zdOUd-aFAt<Pih%`veoMjxy|kwpwphGvOWS;x<%Zia&)cvE)>iSDQAbiNS`(aiK8}b
zCJYUrA>!e&==E##pU7B5;x0(X^?3rK#wUw$1rx<dR-}ep1Y(XT-Lt{>B#IovCOBCk
zBUsoH`i4H`pVmT()b_%Q4)l$W2{Mh7eey@!(%gnfA__drNL1+g*3phU8&j8_eO7D-
z!&Q!bYxeYYx&dNUEy9w?e+wfAL2l<{$c?H{?OeHyJy2-(5jJz^7M&;IjQY-Iz5Rd&
z5zDR>RYZ6qiZkr18v|n-_DHW#SGG5Mj|p>t7DAJIJ&hp}mXum1_9OoKmJ$}PyEDnH
z1_H}sM6PNj^Ld!~5Fy<e)|oe?TmeMwGnx=vxfXvuKnAYqMqj@D2yoh`ob+7$n&~Fo
znvxXeCu+Y-Lp7S+ea8wvP6Si+n(sj`0$5cpp3JoQ5NiLJ+ZV4)6l3-(#SPumOTPi}
zG3dQ5sv+z;&{n>N*srit_<eQBUc4y-(}m;HWox_w$vjVuQusG}5i)l-KH@6vo`cXG
zBK&oOz1eikv!MJRdF!GK>;4pBbWZwA65A1zGRFti%0gG(_X+e~nCt9n&g}DR<e04z
znTAvj#qZRuA5*d$l(EgQP_zSCSyte`KmdM_bT(9y-QjraiUU69i{fj{pVu=G6q~-F
zrH6hR+lt>(Rao|h+G-D)ln(_pmpO+U4saV_?07w)lw4coulQhR9`U-jvz5g|&_Fm_
z;4fHgtH|@&J5X*y$^GruAmg3sJO9Q6k~kDy)M(ct8_>ou=u<c9_k-dl!%VruQ`M=y
zbg-=8I+#YveG;;VBr^O5#4`M+L_^ZEv;>%0jQQvD(g6<d=Jt&?XZMXN-+p{&_iGeL
zlZ9r7u>8I$(>nNJsQ`4MN}S{-KCmn;3X%^yTXSo)SvpjC%<miBmrV{{>g2`kG>eiC
z-*$hFqEDJwCvS<Y=NPbW?-fu5Jv4`oQc_=!`-s$#b<_yS3~Tr90!s9PW1?f-#Qxiy
z&EQwl#$jlp!Vk64YnxaeRmy&#Y)v1cz{qRU2_EIJ;0?QDOV)x1BMpbouCeJYv5HQS
zR6<re{p7b@!Zpt34DV}Q)X~>GST`tVl<AGDw@QXV$C#(VYiq_}Bb^_wC&0YAg%tW~
zEh~CiKQ3j0X?&V?UN4-OH#9=BgOv(%7m|0C_+fa$_rlxOR^73LbX4AM+TPc{1XKzd
z;={)OX5U{YlD$`fyV9LBUs>vuc9AJ?X=_!o5%h^4)k<V#0|^->?NM)#oF^1k9}-rR
z%Bqq<xM>7Xwa{gt?ofqjR0+9LT7`I%7S@Bfv!rPmjABjOBotDox}GDfHGD3gTYBR{
zFzM9A6W>z+8_}Wy`!RmF00Chhn#jQ_E;z^x9?u>FXhq(EQ6O{CSG53EL%F7oq2=(<
zgEJiX4oH(!?P3^`-isr(O|zy>WO~tu!WqUMJ0R0iNy4UL=5QL}V%TW4G+|r&CSvr~
zUlHw^c<u=l-Qm%POGL}zci}lSbs*NE>~*wt``01tiEzYg>U96=CUHQcrBZloD}wZG
z3M4UUE`|~eTM;`|=0bVjtlvgj+|D7i_%)hNOH7nGUN6q@C%B0M7efuJ$pcg%&3n<7
zO6`B4X=461PjMpli@sR>w-p#q2Z<^zzYS0|C?quVYmjCaV$)8JQ1--LjO;%aoI6ea
zHly&jW&FO%U(<^bws}K$eqm31Q(8np-QQM8<a{A2%jAFtqzR+tPuq$xt`sShdz%sF
zMW6kfj{dQ@U(+KFS?R%%^82Mz860dG>t7;dNC*mAEv)a3wb$1IbWdi=^zK2fVqn#K
zIIpJN`0!XoVCufA;hd_uj~wB9%{5PyT+R4N-i;Fb-vVl!y~+z14-=~Bx%=naSD33$
z_47PNGphJcb`ZIL(i_}R90#@+W<?d#B5rn9(iz-r?kTpyfjF&BKW+(7Q-Qc3_;d~G
zT0fN+l8rs7lQ1<aK0cS!?MJ+Fw|`@Q0eZVCw8HaeU~LDc9;t(7hRP?iZLc4S;wg`#
zUII-IPr#Q*Zz{hW{5&w^S!~Rr9!Ry{We>*ifukL9+RZ}qI6?<sI!lXzRYfl5FKvYE
z$P`aeBd;MgUS>ZqR?MSy(btF)3Di|t29ElAz49-oTClcds_1amy4L!P0tV(pj0BNh
z(=RBR47lFGrhxIa1PB$zNF1DpU>$#<hr2p?$xNJLU#B+$1(xme@l7i!v3k4*;V7^U
zzb^`3=`xhD#<RH_kmgiNu+ps5Kd1WAUZTdH%)=~pq5}0fu$KFAs7%K}Y&5tn*YfcN
zZH)j7n5uAK?ol40*c{wxVO_x}4@Xfl6c}}1p918<k-wK$Ou$u+5y)5;MsRe(Q<@nB
zt0CQ1bEMGLvX*^?bZ(L;uX}tI50p<5ez|!4=i3HEIEl0`1PBNj+@J4we;idm8#_3d
z+nD}w63tg#w%_7F_FON1h8jA9fF~g=BUB0)CSf)rLnlu&U9_oSYic0D3if!eqk)Sf
zP0L8#gludck9nZ-e0b{8Foly;q9hY=nL^?sP)t#%Oo50(8b0ONHxm*TO-5sYamw}|
zPx5}b_!i27>2K2Hk0vO_lL67lC^B<&zyc+E9YVvOZBL6%4&a+D=nrwD3$vke6@Zta
z$TOM8xqdVi5F#cQ_$E9f@4zXOFk^2`LlS$$DwA`61%1Q($hECqKni7Wi02NAnJEC9
zF)irM_EKWC|LIhs4xh7fXJlE$;FWl|Z&k9`D(WufhX#L+5v-=6AIIlYd%@mJGF-fO
zCqkZnIj4=S?uoFQ2JO1F<nzbSud;PI7-}pE!i_A3pt$L|6V-}1gL^&EAN5pJ$W?OW
z6en@F2rM@%f{QWG99*zhtpb!u4Ae7KIAG~2+4S<aGpMNe^OJ38js^JkH6YI+s$2>Y
z&hybk=er;>dN7iQ&!&3v6|2w|S&`!j`xCQE5FS2u=g033Fj&H#$mTHBiUdg$RG=zW
zKsK0;=*vi&d=N*$(YQMieQ8J`LN7QE%U#sVhL?c}gNw}_NDC@79jgvM^ov=oRlY|5
zNNlzC>HWfH^T(}-*1~6eOTshBnA9qpWMFpB<~v-2R8$egaFNelSeb$nyY;oS<rPFo
zF1R)kplFx{+{UQe?Z~3lp2;ty2((r6*xVFfzVDdxu1&R|yCt%7u%{eLumG?V6+f0~
z#~_Oe!!mM>ZCIG<(@A~jY<9~{8MMqBNt}Qkz$g=c_>MJsKZ7`?sZj+bVwS;AUR3&?
z9x`&CqtNm*62Mf?TB@qOl37)`gLOj2#s(r0n%n0ir6Ny9m}@RsxzN(-YmtFKO^StN
zPXgGbhaQt{g06)+ovIPJl+rRc(2#wQQPt1(n26lE;Hq?lfM4a?ew)a%&+B-M0jT2-
zeLk;>n4YGdsi39$g=5S<t>omkE@dM<Mi8_;PaXSqJHIGIkS@_1s5K>|X0Swl22hvo
z=cZ<SYt=&cK{GokyS^fvm`#$q)zJ#LrPy9ep6NQLldTVrLxnl(Pb(MSoyt?9#>d9{
zWm4D75}(f<c#}UE2E7j}*>stN?-d#;;?qVn_1|GMabV0uG@0(K+<p4QaB>^WTp|FZ
z!F%W+cF$SrbE4M5#5)bO5Ov9=I9OStey_kIIdg@MuA2pdsL3(YW4x8HTBc+si>bBM
za~ZmX_hFHfE7(zH*d}DDrX?cKO)WI;=_qq}jVrrtLq@S-mC8yj$+lgG1Dn-DSwHVH
z{k$=XdwhrG6~9X8alfiYmo82w71P~PF^;Lok~^sIEn{6E{3t~-M7gW;&(+*YqvX&N
zVgwrrg$9L8t1gL-<L@xEBO7W#QMC`mi}2X1*>jsov$OalwPU%C)fE7n5Y^G#1cX+r
zg`soGtz*&B<C$Sut;Lk2O~cAidn@(cBA32z+exZziQ$8=RhIPW5Mo5{1Df!G!b3yw
z75wL8bL>QHcgnTzZ15YBUP1mDuWFl83tr!DM;rhkASnNSZ#Dq}9c+LOf4(}`#t+&o
zGa$cRN?js?oy~30&_WDz_L#+JP1YdsE5(ZlZzGc!&jHtS*tla1j0EVH2JUxXgHttD
zUlU|%_WEGuAqThOg|!(e0+-OY$Is5ffFxCs#j$MJE&_-vv5z;iNeScBAcY-vID|rr
zE0(I!OPm?xA;zppGkuB-;22cznWJHp6ZCm5^oNX6Ow4b;A~4v{l6hoX$kAfi+RK8E
zqVE=Wh#y+Pn<R-_WNNkYHx<ZQi4d=VE*`9Y@%5__-SN-vC7}q|Zq43g6HQJDV|INU
zK&Vi)-)RaD*+j4aF}BQ!V&jz*3cH~&_a5xgW&6QfUY(}VHh8Hurf*o(pT_}a+Q8gP
z@kp?E?FhZ+&NDmTQxBqtB3kxUP^OF5<oc`f;)(QNuOw}A`wd#OE?2_lJgh9)D7O0{
zGs0yze@PU}1?N(pTc&zW?RpMPtGf=o^*Uto&5M!@Yu2{e<Af%Zy%1hT!`kD5B@Qzy
zd~Dq5a2cvL7a&Hw>dCIKW5U{h&BF=x{+JCGL2!<|oBFbm+ib<4u^@<x0fH~2iom>H
zE_n2z5Qe>kvU{!LhPEFoK!AhRQ<l2l&ctCn0y;t4tM}r^)%j%!!h!jb56O`VQ>EKR
za<yI;&_Ku;FZf8K6h0oc_#|j_dH~bW^i}V6@hOQXyL2*I=N0^)?ow96qJRA6E<A7U
z^6LuokFPgl8>9btOKJS_o43FRok1Pr!LRmLRo7sKbF`XO<T!UXee|KC4w084A>q_q
z^NNkqz=QaB+(#aR?;T4v@9eFdfg4zf;vjL!LL4%IOZDxR^#1v1d5c=&yJ6EORx^dz
zxQcC?tNZDt_kwEJ=@k<EW?C-Wq?{bVkok%D0iW1ZVsR=eK2t)87}UpU%Oe%!4%3V;
zk+XCJ))KCLoE9^Yh*J8DojpM~hZz28tU&*#GUL_C2GK+e=RJw#fvj)FDk3I@grUPE
zoMyORuGA#VA<#cK#n_I}X0H))jUq<}Ck9&q3L*PMU@N}Q-JGzuo8Z8OHYBeYiaYAw
z0s|<0&-!rzdsm2>Yy;jo2UBJ5>tPvUWxJA^9*Q3LQxbzMdYl{D&o<$4$%OThc<s`e
zs%Ncn(8b!a>vq)<qnU7nue?kI>j*3yliU4fNDr<?y@Ou<RmVS#87JCc7}B2m!G#!y
z1l-rvp)7`RaT?biXYynkPu~wNUhn9caipe;=ek@}%<C^G;n`o^Q(fH4pg;v!6|5%Q
zb!9MMs{4*GKm`TJRZ&UIr5e=q;*+h>FntguPM>F*vuuQIu5!O$>>>DW$G>kPBbGD<
z<aZX^)M7C!e+IOYeDQZuWIqvf#fA27cxn%6#@r2^An;UwOl$w&FX`S6KYzN0gPF0l
z@o!gktF_pduy6j;j0pmQ{!hU_#2J5G*qvyMMxnB!wW}SzGNf`JlWZGm#E7It8N)SK
z5P|kg4stM?eEc!s<TP07XP7UkVm>Pr<93u|5eA`1e_g(qSe%dYDwuUL*dv=>mR%(H
zCEbLl{q~91>+GI5iEe$|%r?A{fCd<taHW8`;nDLcmb~<QPXBhr1QR;s5>p}Zhbl)m
zQA^A7g;>%=qO@HQc=UKLhDG4F__)#t1V%ptlCf%-vCZY=3wQ~aok7u&Ntpf7eNom>
zY#b~iSIlh+@LFfY$IYMGrcr)d+OVt)xh>@^Tcr9P$_iP%(hd|zk?*Vnv$;*k!9DbX
zKt%+*f>kjO^cpHX&B3kF1(nNUYPX$k%A=_vw(^QI<H)=1r!-4-Esx_LSbc_6w96MQ
zud(xa5%}}oHJDr3IoPmSW;prQ^6yUOHP>sDo^rWJy#}JEIhUMd6di7`4(ykgZlv8f
z)$eYx4s0Az-@z%6Tg>A=V;h}EpnH_-9?iHT>iR26Ugn`YpsC=ry7|%(8j9YwoST$a
zHBZxSz@b&-d`(RKG-7{1su^_3*aoME9!ex}$v;Ns5-!TWjF@XQAW<O~t6a=Efgw8Q
z%*=v9Eo9NeAI_07pz7l2myL{}srT{qV)m-A^T6M<5Xp<v^X~k*b6hlrxHkB*C(-Tx
z`Mo#a3(MWnfipe6=T1Ky&g-LG*7MJ!BrgKxiLUhbdVKdk7USNpd%Wx+Me&^DMFz2X
z@H5f)9o>;M3^LhDi}lvxBHbTJz$*${g=Fx&qY$&eh<eGC#=E}3${p~xG-UUy=X5~E
zKOefzG_>X0QIg=nF3(Q^=g|+Z!@3pSOidkzz0yx5e;K@=>01@vUto8J+L85gpN6@X
z*-~1Rs5IOq6loNO8LNb!VRs6s>~C%k;IR8hKs*M4GrU0uv-HJ9h>1WbSOzZVW2}I#
z2`@O|x~vtV4V1O0r>^rwWmrHl|BT@ih!T0Y+JtiMNTIzClLeFq{@{$Mk$0aMTNyct
z5m#qCWGg1zW?W-uryljee75i1v=_f=O4xQR?!Ch)ai5h@5}u=Cyo|>J@1PRSV+aRW
zXzoU|1pbpxBYN%{ArggN+UYU`_W^G+&Whifd0Gv@mj|YuOl{rHkxihtXg~CkD!AwB
z!2;IcxYfEzQ2l&Ej!N6z&&vK&=UU@4+pW@+)_l=c#QK#??(qKY)w3}jmQf@|w4Oth
zn;cGWv$0M0_4N7Kt7YI|7#%!<rZr$xSL>{W`L)kon&M;_tM^gxtQC@m=YkHNiqLbY
zXNS@%wkwayaN=|WB~mg)7%dg$opiEKwLybw!UKQdV#LKlIxY368`>!O#GXR3yj;@0
z;i0y1FE0E1AuAabRz(d9^iL4bV_Z#xTJ!BqGarh`gpk01li=s4RNj0g?FWZ4&EU^>
z+*^scy^3AtHicQcoiN(+MbLqr&@!5vn6ifF$ub18f+tGIG8>47B#nbdY3IgWfyYEK
zsoyQBQf3K>QLcPqzoXlv;->UWXe;fsGM%=gMF>@-?#`!o8;`yqIVxSujN<HIxEx#}
zNA<gqSes}Phr;dFnz35J)*KXGNHBa=@<Ihwp;pMx;lM=&HGOr1a8RVTRZ}TPpKT|w
z??`D8GFp<GggC_++gJZ0t7udNr}X{X@f1l0U|7?3_9*nHV=r@LKN=Y5e2^_)LmsXI
zYS)edJpKF7exX^DTD8yKB}0S8-o4+^GpRLA6?%m@{AeF-s7@nj>G1TnbJxDl3@a<s
ziSF(=DjKXWe}ne<Or`8ZMu2GygV_-2VLqneYI~)KY?)k?KT(iVeVR~fvQXjV$)hFi
z3ZA4pMbT6=WyO`tf9ca}(vUk}n!7vHSZg>2e>GMWzZ4p&(TF?tewul~MuQcJ@%u}i
zN>Cg>4yK$!I2^t*I6H3#O8YsX;_A?me{&yBspf$PxxSbyrGD5T?sR<b6~ATyt*FlQ
zE+W|bmGh>8jM``QP+`L|CrX>wHd+vzA>{<_q$=mq^+ul+CQAb|p7j^=y8TzQ<413{
z7ATzpxZ6@Cs=xyf?3!n!e;z<mJW17E-_m$?T%dm)K;BZ{j@HID4u5=c=x70n`xCtM
z^k4lu)C@%(%WXOpC)7-Rdf1pUZw#k$DMBz~WmvR?EHimJ>0+g=$l;Ec1Z>oybTJq7
z<7hT87kkp4Qeyh9=zl8fQ796T(>k%MV9%hI>#RC*?{Tj;&K#|~067-iW~9iTU22v)
zofS+=*bn=lo+l@5_By#Y@k**$CGsW(SiXq0u8x@lr|$dK_+Gk?rZfB-+?kFerfAJR
zu`H%UHaBPdV8J`H0?IY@w;HfCavwX#xuD<|I5%I|a`W;WJG(DWb8s$@LFXN>a)dOu
z4nmyniR6h*epO;&Z&}jhIgQxR4Yp$npBh}{;9UA3I@ld|foJB4oB#a$lAV<)xGWw&
z+S8m7XH=uaGm)_f{!Pm15{gQ9h&q<KRo#C5NwOW&_c(G{0thmW97Wdud?CU<XN}P0
zqRl&%m*luLX)FH%<mx*fdN$E1V}kNRkujj6!)}>ciS6VVpvOkMw3EMbXDmt5`aZSs
z3C_5=yNECK<ANJr1`buYE?ZIWkUWyTos`$kq8?WriPrk(dfe{B;%b34@vXRvW4pd*
zx6)OdkLk7fPCr>Q;X|l((zHu_soh^+>{w1mKbZ1d$dZ}!T<5W*)^caap2_ydHLofV
zitjq%7c8Go_ljhc8aVH*O;X6_K7(Fchc3>cUD4JGaJdsS|NP;vbd!3D6q-~Yw>A2F
z?J%*Nddd?DXvSMwq-*nf-<Epn#LwHMQfO$#!X@!zar{;kO6|q=T$kl>H824}k<F6k
zL((X9CA*K8oO9C!0bnq$76zX@%9&f*lMhQwr{Vn&4)!(Tv}5^dloIBYW4Y{uSij|Z
z6JP2zlH0oW?b`j$Yt7ou@*>GN((B8H)}*;duG?qEnBZpzHZ@%!!<|!nd9YO(#-1lz
zX|GjBIi_zaO<LMBFU|$}e3D^PuJ6;JDN>wwI_)%j?2E6ajM({MFL(ntix7?K_l04-
zA1%&FZ3T%BT);*v1{wX5iVVAW;afy~bl8449r}Sf1gp1oZ?t}r8bK=7n4VuAlqox~
zH%3F99xW);`W|mX*zkq)B7wEIjOGQJ$=qhHlD5b;gCXt4ZY>@~grHnMUnJNZDL{n`
z4$3p12RhC3ZY(6WA>THD8!c(?(frKa0CVHa*pg1m^}O~$t_?O!444f*BZvX}b=CuF
z?DZLG5C7$~_mR*0XT99G_x<MLw4Bx%d^LCyR6yNCN)#{O<7Uzx{?o>y9<SCaLap@W
zK{E*st}vd}#c^Y}Rq{9U)$3L1;0~U{!U=3NEfnVY&zu%sc@&kk6#@m^i;?2?i^%~O
z6d68dJf~4ptFrW|U&p@cb+ik_ON_$H{}grpu%c$)@HA|*cX5GtHY$kpel*|RYH@U`
z^(Q2Gy`Yr@ktGr#{KQlx=RTe&xxa%K{2FK-h(limlF!E?R)?gS(MxiQVBTQiqmi-s
z_Q#_|Q$ClM>*1^0tn}yYZ$I2k&%A3H46XNBWHo#s2YapY@}H>WWXdwLo(~T0r(d-{
z5(kPZ(KkXiKzn~hbptK5X%h^OQJ>_YMM#yN(wVQDl`(H?5+x!_S#(}>>WSYw@|+a!
zQKoxNMZR%t^H*Jn)CRF}Og25=B#OveR%{==lczQDQR0kKlBc&&pkudOWvIYfC?4wi
zo+q%0s5ZI;={U{A+cRuaN5-p+(|(DJA_~^CtPf~$;eZgE7VMwlP|F6yhZnDa(<Se4
z6!F$q!itWb@8FIA5w;54&&Zx@>KQC(%UkCYS7|<jCpz449LTs0=INTAakuX4TW-Fp
z6rx>A?NE{qppRJk6S)2?#Ls%()*H8+BuRFsb5fvlgqQhb7Tc9%|8ebghh?yKCL7wU
zgK?DeS*sL~_En-RA5a-RlJC3B6Wfp_dN6228{>*cE1p04^`ssokSXSMX)eufiH}F8
z1b_bBv!Y}epy9%+Mg)(wTTXuWeunNYL~124m}h<G$o_p|hZ;IiG!FB9Js1f!&s9^3
zLpg(cXHrwc1(zPRkezphUn@bElbsK4w=U*S!3#*z=0yrCe-*98p-#Flj`RJahLL-G
z59`(KyrB4f{!q71waPyoA3CEAA0y2=*}Z>GBV~EN1kZ63fI$U=ej6vy&WRa&*_+=x
z^Img<YQUGYY0kY*xV|}S=XhNdE8)&2v5D<<CV>MbS9a?$tjh_Ng3bSOH;tgSVo`j@
zB^ZiqtIJ=cc%@}DodXe}*gKCU2;FxM-lv(3btvCEe*g+A)YHung;gdLk6GLRoir%i
zE_p$*qm8P3;aCuFi!YEY4_90cQ>@O^6{9A+j#<1Q-)k-3D^&;gm7Bx=WfIydhQ=ii
z&Q+)NtHU|{ZN8)wgyK>y`Zm>~Iv~^-3v)hVswv?6@~5kn>6-c?z1fHo7n&q#zpg&1
zVC>i(2$L$Wr?Yh&i{zIn*TvNCs?u)_w-{b8d+R*jmygxn_mhii-n!O)MG9jx@{Dr_
zG{U-e;z^|!tWE&pu1cY$wK0l4im2hq&z3av7b)crwKo}EQe<X3Wt%xCwz|Ujv!K9y
z8jXde!@6O34I+Za8Okl<Z~!~DwjM$x$3E~NZV9_(g&<p(Dc8Y##rb0nWV5v#rPfru
zw%Vg}W0f%v$%3_<TT;XBPwM6Bao#zBb;<QlD}^`n7gR3Fzyli-=arT=be0;=gKe}^
zz)fi|iCsie8HqByT{>xT{Yk!7HyuBQBbWiJEM>j10;Q*v)_lFX?J%i;JMK|QF0lQs
zl<WZm%8w&b%Nq~JGfgX+o|HfpOl8QL@?&}906V0z$xK4iiQ?lNF~p)*W`NnTmf`xL
z<vJ{Mq8)9lP&XOK0pNJK*Jn2n?;HHwVatwWW#?CNp?MOQJ*)@nsWV?`-q-tn`j^Xb
zu7&y$=MZ}K&A_>ZS^KM>v_v23@{8n{i*!mUssdL_e;zS;4ii8KoD<a!?rY@%Z)WRP
zP>{1NR;fIPm+OIeS$1MG!3QPZ^VNFWp6mHCUoQq1fnLu~@8$HKewv!TJ`c{zwXe?{
zfA5^L-CYRKI6?1X{9aX@dw;9=Gp75afYIj*&4d~{lo^A_IJvgTCeb5{?~XYn@ja?P
z2BEF1hH@zz%jB;V>FLOLuD`@hE7y1YRGXCg412!#>gn(UHX6m^k<Q4UYAR<8xeSa>
z6jW8gCmrew%K>ZgSCGK*80!$8?FkD0Jdhg|A7p=ACJx!$x^zXHJZK#Y?r;gVd=Nsy
zXLXg#@w_^yRtmVKHmg(q+4-bCdnMd}6*x8&eO#HQ=NAu$3wAsTr1CABsM)mq_W0CK
zFa6mxXs~Kd<OkX?3iaL-<3fhyQNuZdC9~hIJ>?S2M}tb9$`nCpwQG=01dWfj$2<!$
zN8yRB%@$YO!^}|D!)e2sh*&zZ;TszV43>;Mn5)4?idJ#Y%OT*S;iIEkd0dx4z`^0K
zAp!DU$}ZPVz3f_Upx^<xa-U3zJ2e29(#})@F)hb7o#S8KIT<EM*uw36!OvZ006&6Q
z23k9hdV>Tmz?R|sAI8E^R#dwH3kgHB336?n0053zI07<a%Jz+Qvc10*0o%wN91cIa
zu?4poafl)S=X(@FO$bh5d~=QTEF)sz>KMWW0PWDfO6Cf%k~3o`#10+=z`?Z2rf2g(
zJ&7K5@$9V=u=0t~-SA<CmV|bBUeYT$?r1Dx2S=O(Ks`V-qFNb}pC48)mS9L92r-E$
zg&L+M_Kk`|R62Dn+csnr7g#JB(AgnyFl_Ma*%An@!*RB%OadAzQH)0eaH2b|@a8^s
zB7!3hZG5R^Y9c6Nx}q9^B(ZoG1MDVTAiRhG=1>fHGe7xCnr!;6rn@SS*8AXXR&?+O
zFzxruxK7rN!Kp#^s9){j)L_L#;ZT2{gBM1|+y`GSJIiXcKwRT$(swd>8igVlBLu@!
zM2jZZ;d3}j!fkGnjC{;<s5cb%r=o=I5=;I;q*WGaSV$sGO$fHjm1&5cu!3N&FAnZ0
z0e(y{5C+WNm24E?*R9RS^}(Tjo`WaqXxnQ_RO8D7CVXfADggc!be2TSmmjPMUtB4#
zjO9Hrh+2Q-(^S$8yEWxqF(J4X5tKq)p1f?^Cal8_to)bC>;_IIYt(`4N+QQm0&tk%
z6z1R>Q%G#131p@T5(xnYG|kvFl0Zei6?hJ0dHV3CpFxHQ9I%jnUD;&FlekCeixUr1
z0C+<z<oXN$SS?2q7FC6EEL)!xuHM$(1}1PsY*45rBT5E7c~e{L-3^mYP&-eG)d;o`
zTw5)5-aS``qzg*SEWfr5eiQ-Y{n@Ar`fs%|3{Vm1FO~pY1_RV(m_w+~*jZh&TG^Lt
zTFO~8klVya@~+P)^CcMJFdRiFwjBXI3#K=>)|8J_jp!U-w2l>&P%DLl`bx7)w0wmU
z=!!zs^<)!pj8HfDt8>4Aaj%H1G@x@;gY+nJClv0Q$)m-LCCSVYO8MT^LA-QuyqBc4
zV;+OtTI_N(`n;<^`h_3a?(Gumd*CJ#ymvOeH%JRd3}{*T8XL?z7V0Qy6=h7^R{5;2
zEf$EWG=Yv`*fa!ScvWZ+NID<RAM~FNsTeh2i)~%pGy_>Sg!v65XVTegQHb~{Dy-@`
zUWN(4{GqQ!ASm<`aVmC0gKYd*CcaY;)msIll<*d7k{-!42!L+_q~mBHkHNJ-zLgc^
zc1EbObYR-4+!p<0i7${RH6qxwwWqedYQ{FwkM?aF@F7a-#M&OUjz%B=&(#nS-VB<m
z`{)l}<3vtjlr516W+<)6!cx<Tz>VS&>B-^mQoZ4$-WCNjoF51Z1;90fN6fAf07>DA
zu#T4T0UxCz5>$+Z&sX6?n3(|30*I>i9*iiFsR(M@S|OE!+>-4F>8X=OgfR)iW|4k2
zV0`WX@59yG9+>a}2S>bygd&PBJBsC5t_zvcPXmEUofRZ$JCj=EA2bI?T!MhYHl`Fm
zWDc8Q*HELy1V=1}!0lj!jfKRp8DS{iR^908$33Joc4pn^@B#Pi^fel(J0{ZnS@$-p
zA);J<f?YOwE4MeF2Zf4&z#UPMog<R+tprih&8pF=wSpHe0(<wRoC<MZcO=gOxsx<A
zyKGRA;-eH<jKaLIC<U#}ru>|<Um^s~KuH}nIqK>mv1U$%ph*=P5yd`V)73^>C|3JH
zHQIv5S}vjnEc_uU@f<%ZuRk;sOq|ntpfTI(2{JrGiG3oNQ)NeDwfU4!KxVIy((M3&
z-*Hcau-+6%=Vq8Vi_6mj8M3d5$UF3lt<dbYW&3~c(RmUnP|hiP>v3DieEWu!P=IZ5
zI`zjAuPSkKSd}f<3P{Sh907p5tqrcDdtXL2JrhBXUD4T0{pVqXDj1{eH@j{b3bf>M
zx#1;+3jk>Qu>UkJI^pFqVUo0+|6vViyd<K}BruY^6ao=BcceBn7M5)84^4vRe?UVs
zy+J}-BjK3%PDJF0TotpLNoZ!~FKPyEU4_O_TO`y~;RLZl#bTZdUo4D8kOuh`rl~yM
zGob@iG@8vEUE&7-7t=PIo`WEgwBtyXPrqq}AWa{Ur6h2mkzQv5Q8VrafXf1kcs-~X
zE$=;Z@#YMYCif;Quqb&GfYA1zZM4REq_zas^CCHESLlEA#mEuuThj$t$=U%dLcC3j
zhRCq%)><>mQ^Ob<+jatiBRNW9=53EMhjg^c<0qACvIX%Kb>Vl|VfY1Y234aWI}46<
zxAX-1LIa5Q;ob%OAVOO!t41rbxp|il=L(CUoYh8kG^zo6l$qbL_s;jtrpRf2$yNjg
zr*AuS6ENG2uwl#De{mlq0e&h#iFSC0rDA~WD**981h&;>KrE}!UM-8e3XlL_Qdbam
z*{^wY%0;2=*HRjB>Qg{j<@SNJ{7l98&D-{f>f&QRczoR|cYiBk&k5pV9tVtt#vo2=
zn5p;U>^+p+7~lP6FS*{nexM<s(^z0ZcR`F(sbFqn*aAV3Qe|$epwu>imU1MgpX`Ni
zJp<bm@Tvc1qi1}VpOPY_&JuE>&jO)rrZM?3vtPn}>rrL8k!zt*oe8$~hrLoEqL(&g
zeE3*tj|UVRRFCF5P(@Jers>wLPVFj5y6fv8nB*>E9gQx@CMNg%LgT|yqy7YB`byc>
zYfUAJSBYa8(zh?_*xc-nWS$hwS9f=jw*_F)44))q;lH|@>Uq9C1><ME_7~E>9QjL=
z?DA0$)Z+Ie1uI;hdtsAO&d456pYl(}<%us|u6q(Y<(+op#w5NXh(c9+?>aX{*MvsN
zpCo?o84jzKcK*Qm>(HL+j)vgGy}CwmLfZQyNk*H9O<r73Ja)WDBCp(;n;msTG)4q$
z*<xN)wb{$tHen@JaVfmfsf~ub)kafZU+fmYThULEA9Go}$k+q^EKsEMsr*MCP|OF!
zY03qDojI}edSt>c3S)@(wBH;XiQenO+dV~?UX=T!0R7^LI&R4>(hp3GW1IfEkOvos
zSQGp(Cg)Wb247&9hm&Z-!}z{1YbM{gz=|jFLCI=-)_0!$C^ys_@|)cgucg5LLJrF&
zcU;ojJ(M2?Rzs29%g=WkEXy+!TZ70>lWV^x3RfYvr(51C?nmCJDSyi=+c+p2e6sq3
z?9i$r@GGy}@_rv5VhuGW6qiyop1_VcJL$s`+Q(@oV^nkr-}t--gpcUYVtn%3>?b+x
z`>{1YI1=G;#05KpYL;|p#F)FUhJm@Tr^#&EgYYqi;b3HNtef_!Ipg*B3ZY=r@|-yd
zu{1((CKEfo%j|n670OkNpfgg;Xd*!-GD=9@6KKq2MVzXvapzUaniGHzH!Nt%-Wl^^
zfherjcgbok8UgS63e6Tp&!$BZNa+{2RYoA=B1({0OS1D~P5LaW59dy&OI6$yEmar{
z^~ZBBpCNWGa}Yx6v0-%0jFlI0yG;c76wI^)I6F^el_`*W&!3g4Wctzd=VLK-Xnf(8
za=wE3)oU}Ldgxo9E5K0c2+HI$h4YW$l`;hoH^^SVeAvMBdbiR`QIiphH5<f=6tWO3
zMdebfE>e4RbZNPUR;}_BX<-9(#Tq2H*}D>M7qk(#u}vit9Tg3qk6dYq6{1hk?(?DS
zaGP+;9(KMzKbohW6WNz{n2OzWpRy)!U|nzhb>;OK)DHw16NI3o1og{x4IDHVFg^;n
z!C*j|p*G3}Z==rdjvy3Y&=_IU2?D<cBLpw9&4Aekf>#PJLyiK@zS5^hj>6%_Ml$#4
z^+fpGHXopFFfH+=pJgcvS*>Hb7&Q=D4;=p!IWl!@ksRh%ILK*x!>6!kXghFZVfM`N
zY&0JOh!_$)ZQ#2ttM`O7IOjoh_UdeAg$L8U?dyC_M_cd}E(kge<(N9$8t#~~Qwo{k
zmnDS^(eEdE#Yb69mo!a~$WhLNnfn2ji5CLt$QE5S9*BxP)a&Y&KOn^~%nAF7wQ#{X
zsG&jlZNYlJY*1c2y17|6XbP`?t6Zj~4QwTDsS*n}>+MgyWgv3yFSvr*5G|K-_>dLc
z3^CxoOq$EVIYD|%*>ZrwravDfMRU@n{RH*DXFlKZnjm`i##X=6ut153@SorQxB0dw
zeq~4hl%e}2SsJ@43C@Td_{RDn9PwmdrXrfM0t)YEh<o}FrmP~YK1EB{db<02H&m3h
zp4&5-j(L0@aQp1w?~)U5eGZ$bg5cMJ*!LjYd39=F2S>#0<}Y;qbwe17ZFHyiAq23^
z6z`5xO+m*?y`S<UBVOZnn?a2*mOg`xBv^ZBX7Gz!6yBhU&icUhG<a%E;Q}_Kxn-Ha
zv23N)%QAOO>8u0(b!W_82)g}uim_y_Pmtw=SmwM?C4TVssV0uRqi0EyV&MR+e8dn8
z#)Nc~<=A6(c>`CP@p~Ocs2U!8Gmj@_9tWe#pb;LFJ`OR5n=IjnXwC-LOr+8GvACWi
zy9ocgCjXN|{%`6eje*~KeN$rvI0y*t+vgv32!9IxJsI$)e&fb1x*6d6&iq^bCq3<^
ztc}CDTH^)EiQPfy6<#WYVe7aO>$6};zUCPvX~VCRKOF=c;Yaf6l(bFW2MzM0^kzrf
z(_t6Gdl&(c=(AhYsjP+r0Dx;->9aG$vjt6<B#+f=-9WTUfJMxUie=XPf(E`_6dDz2
z^O$6G*;MOjyH%ju`+oP6M676C<KoW-9T{OCi>&sA_Fk(SY0_}z()GAV8Ycylq+=Jy
zF@%a7(L;R~L%}HbmyyS{1jRAO!1UwYc;Z-t3Td&TVL!n%r|&UvT0%!@5yg*O1{>7P
z5jbfHx}d?xc`^nMY6yw5iA3k<&~-(*S(KN*XgvJJhH?lusBnEN;J|%z)VDMWh?Wr0
z#^Eh>qNnU?Yy4T~4>nZ%@GnN7$n6^=Fs5GR(|&F-6<8Q=A}!nlXxT^Kq6?u+->!9M
z6ll0?h|mRL$>YY`yRjbs$tl%AFrvh@o!qP&VK7;Dr6zMaUUJ|;o_KUTbMYmjeI*!L
z-sZ`ueif__j2ibyZ#V^yM2H(e)nFH#LzmK{CiIR~)>!^QOGaSr)(uI~U2KCQUsDJk
zieA3RRb=oemaklbNSPvb@22mqf{QAkcqTMinJ#_NPJ$f~OO4IlRu#}<2v3N_HAC%<
zV|B>Ok*ba@-bXdnToq0jG5=#9ToN!8S%TYfEuvtdAJMo2%~TX+)$!Grlu!{yYd3Fg
zNsME?WwfY_ciAp-`{X{88)`0MBxIM5H<jzmQ8md#r^Idq8`-tRI>9=jluC!2D)<wS
zqd{&Ab))y)v0cqj1~lX=66%f0bKVWN^@8DoWERNgfusPM7x5~LFMp3riy*V+jtzvS
z%6u}w%7ObN<V-VqwA%YZoQ<h8-|F<|=3AKrC>R>ZU)0UtZS`g@5Ks_;x8H0W|J8DT
zcJSYMQ@;Y!pY0b5G?ew<A?Wu(e-Bi@Fn<nO_8-h2+v@)s>=z&P&-QDuU+r(~)PFAW
zcYf+G;XlVC|2ynoY}Maq`#YubFLc$LlmBPXe-kW!hyTtE{0mO;7Fhm*|A#5~e=YhK
zGwsjzYtct<MZo{!sr_2;e>cjn824xU1({*{M<DxsvcJc?U%)>#_54rZ{}Ta!@9Fm>
z>R&zm{P3?S{JoFg;lCGw{RMZ#_!s=|C1JnAe?J=j1<z#q7u@76DE;T4_&fghlEuI9
zqHlZW51s#`fbn<y?<LxQ;S=AOgMZ-vUa<W;{CB3|UvR`X5BL-QAKu}g;Qt@vN554=
r{Q>@W$<#l$$?ru|e~sGsPvBoARPs`ge{6b`w*$D`n>TK7{sR3E4i2Mp

literal 0
HcmV?d00001

diff --git a/miniprogram/scripts/test-ble-frame.js b/miniprogram/scripts/test-ble-frame.js
index f8a3055..4c29bb5 100644
--- a/miniprogram/scripts/test-ble-frame.js
+++ b/miniprogram/scripts/test-ble-frame.js
@@ -1,3 +1,7 @@
+global.wx = global.wx || {
+  onBLEConnectionStateChange: function () {}
+}
+
 const ble = require('../services/ble')
 
 function assert(condition, message) {
@@ -40,8 +44,20 @@ function testBindPayloadLength() {
   assert(tokenBytes.length === 8, 'bind token must be 8 bytes')
 }
 
+function testVendorCommand33() {
+  const command = ble.buildVendorCommand33({
+    region_mask: 0x1F,
+    wavelength: ble.WAVELENGTH.R,
+    brightness: 200,
+    duration_ms: 600000
+  })
+  assert(command.length === 33, 'vendor command must be 33 bytes')
+  assert(command[32] === xor(command.slice(0, 32)), 'vendor command checksum mismatch')
+}
+
 testBuildFrameChecksum()
 testParseStatusFrame()
 testBindPayloadLength()
+testVendorCommand33()
 
 console.log('BLE frame tests passed')
diff --git a/miniprogram/services/ble/commands.js b/miniprogram/services/ble/commands.js
index 5f12cb2..ca45236 100644
--- a/miniprogram/services/ble/commands.js
+++ b/miniprogram/services/ble/commands.js
@@ -61,6 +61,32 @@ function writeCommand(type, payload) {
   })
 }
 
+function writeRawCommand(bytes) {
+  return new Promise(function (resolve, reject) {
+    if (!connection.isConnected()) {
+      reject({ error_code: 0x0C, error_msg: 'ERR_BLE_DISCONNECTED' })
+      return
+    }
+    var chars = connection.getChars()
+    if (!chars.command) {
+      reject({ error_code: 0xFF, error_msg: 'command characteristic not found' })
+      return
+    }
+    wx.writeBLECharacteristicValue({
+      deviceId: connection.getDeviceId(),
+      serviceId: chars.command.serviceId,
+      characteristicId: chars.command.uuid,
+      value: protocol.bytesToBuffer(bytes),
+      success: function () {
+        resolve({ message: 'success', bytes: bytes })
+      },
+      fail: function () {
+        reject({ error_code: 0x0C, error_msg: 'ERR_BLE_DISCONNECTED' })
+      }
+    })
+  })
+}
+
 function writeCommandWithRetry(type, payload, maxRetries) {
   if (maxRetries === undefined) maxRetries = 3
   var attempt = 0
@@ -122,6 +148,10 @@ function readDeviceInfo() {
 }
 
 function setParams(options) {
+  if (protocol.PROTOCOL_MODE === 'vendor_33') {
+    return writeRawCommand(protocol.buildVendorCommand33(options || {}))
+  }
+
   var regionMask = options.region_mask || protocol.REGION.FULL_FACE
   var wavelength = options.wavelength || protocol.WAVELENGTH.R
   var brightness = options.brightness || 200
@@ -142,19 +172,41 @@ function setParams(options) {
 }
 
 function startTreatment(regionMask) {
+  if (protocol.PROTOCOL_MODE === 'vendor_33') {
+    return Promise.resolve({ message: 'vendor_33 uses setParams write as start', region_mask: regionMask })
+  }
   var mask = regionMask || protocol.REGION.FULL_FACE
   return writeCommandWithRetry(protocol.CMD.START, [mask])
 }
 
 function stopTreatment() {
+  if (protocol.PROTOCOL_MODE === 'vendor_33') {
+    return writeRawCommand(protocol.buildVendorCommand33({
+      region_mask: 0,
+      wavelength: protocol.WAVELENGTH.R,
+      brightness: 0,
+      current_gain: 0,
+      hold_time: 0
+    }))
+  }
   return writeCommandWithRetry(protocol.CMD.STOP, [])
 }
 
 function queryStatus() {
+  if (protocol.PROTOCOL_MODE === 'vendor_33') {
+    return Promise.resolve({ message: 'query status not defined by vendor_33 protocol' })
+  }
   return writeCommandWithRetry(protocol.CMD.QUERY_STATUS, [])
 }
 
 function bindDevice(userId, bindToken) {
+  if (protocol.PROTOCOL_MODE === 'vendor_33') {
+    setTimeout(function () {
+      connection.emit('bind_result', { success: true, skipped_ble_bind: true })
+    }, 0)
+    return Promise.resolve({ message: 'BLE bind not defined by vendor_33 protocol', user_id: userId, bind_token: bindToken })
+  }
+
   var userBytes = protocol.uint32ToBytes(parseInt(userId, 10))
   var tokenBytes = protocol.hexToBytes(bindToken)
   var ts = Math.floor(Date.now() / 1000)
@@ -165,6 +217,9 @@ function bindDevice(userId, bindToken) {
 }
 
 function unbindDevice(userId) {
+  if (protocol.PROTOCOL_MODE === 'vendor_33') {
+    return Promise.resolve({ message: 'BLE unbind not defined by vendor_33 protocol', user_id: userId })
+  }
   var userBytes = protocol.uint32ToBytes(parseInt(userId, 10))
   var payload = [0x02].concat(userBytes)
   return writeCommandWithRetry(protocol.CMD.UNBIND, payload)
@@ -175,6 +230,7 @@ module.exports = {
   clearPendingAcks: clearPendingAcks,
 
   writeCommand: writeCommand,
+  writeRawCommand: writeRawCommand,
   writeCommandWithRetry: writeCommandWithRetry,
 
   readDeviceInfo: readDeviceInfo,
diff --git a/miniprogram/services/ble/connection.js b/miniprogram/services/ble/connection.js
index 0967d4b..e5f5ab4 100644
--- a/miniprogram/services/ble/connection.js
+++ b/miniprogram/services/ble/connection.js
@@ -81,6 +81,17 @@ function handleNotification(frame) {
   }
 }
 
+function handleValueChange(res) {
+  var frame = protocol.parseFrame(res.value)
+  if (frame) {
+    handleNotification(frame)
+    return
+  }
+  if (protocol.PROTOCOL_MODE === 'vendor_33') {
+    emit('status', protocol.parseVendorStatus(res.value))
+  }
+}
+
 // --- service/characteristic discovery ---
 
 function discoverChars(deviceId, serviceId, group) {
@@ -118,10 +129,10 @@ function subscribeToNotifications(deviceId, serviceId) {
       characteristicId: _chars.status.uuid,
       state: true,
       success: function () {
-        wx.onBLECharacteristicValueChange(function (res) {
-          var frame = protocol.parseFrame(res.value)
-          if (frame) handleNotification(frame)
-        })
+        if (wx.offBLECharacteristicValueChange) {
+          wx.offBLECharacteristicValueChange(handleValueChange)
+        }
+        wx.onBLECharacteristicValueChange(handleValueChange)
         resolve()
       },
       fail: function () { resolve() }
@@ -129,6 +140,20 @@ function subscribeToNotifications(deviceId, serviceId) {
   })
 }
 
+function requestMtu(deviceId) {
+  return new Promise(function (resolve) {
+    if (!wx.setBLEMTU) {
+      resolve()
+      return
+    }
+    wx.setBLEMTU({
+      deviceId: deviceId,
+      mtu: 64,
+      complete: function () { resolve() }
+    })
+  })
+}
+
 function discoverServices(deviceId, callbacks) {
   wx.getBLEDeviceServices({
     deviceId: deviceId,
@@ -216,7 +241,9 @@ function connect(deviceId, callbacks) {
     timeout: 10000,
     success: function () {
       _connected = true
-      discoverServices(deviceId, callbacks)
+      requestMtu(deviceId).then(function () {
+        discoverServices(deviceId, callbacks)
+      })
     },
     fail: function () {
       _connected = false
@@ -251,46 +278,48 @@ function attemptReconnect(deviceId, retriesLeft) {
     success: function () {
       _connected = true
       _chars = {}
-      wx.getBLEDeviceServices({
-        deviceId: deviceId,
-        success: function (res) {
-          var services = res.services
-          var serviceMap = {}
-          for (var i = 0; i < services.length; i++) {
-            var uuid = services[i].uuid.toUpperCase()
-            if (uuid.indexOf(SERVICE.DEVICE_INFO) !== -1) {
-              serviceMap.deviceInfo = services[i].uuid
-            } else if (uuid.indexOf(SERVICE.DATA_COMM) !== -1) {
-              serviceMap.dataComm = services[i].uuid
+      requestMtu(deviceId).then(function () {
+        wx.getBLEDeviceServices({
+          deviceId: deviceId,
+          success: function (res) {
+            var services = res.services
+            var serviceMap = {}
+            for (var i = 0; i < services.length; i++) {
+              var uuid = services[i].uuid.toUpperCase()
+              if (uuid.indexOf(SERVICE.DEVICE_INFO) !== -1) {
+                serviceMap.deviceInfo = services[i].uuid
+              } else if (uuid.indexOf(SERVICE.DATA_COMM) !== -1) {
+                serviceMap.dataComm = services[i].uuid
+              }
+            }
+
+            var tasks = []
+            if (serviceMap.deviceInfo) {
+              tasks.push(discoverChars(deviceId, serviceMap.deviceInfo, 'deviceInfo'))
+            }
+            if (serviceMap.dataComm) {
+              tasks.push(discoverChars(deviceId, serviceMap.dataComm, 'dataComm'))
+            }
+
+            Promise.all(tasks).then(function () {
+              var serviceId = serviceMap.dataComm || null
+              return subscribeToNotifications(deviceId, serviceId)
+            }).then(function () {
+              _reconnecting = false
+              emit('reconnected', { deviceId: deviceId })
+            })
+          },
+          fail: function () {
+            if (retriesLeft > 1) {
+              setTimeout(function () {
+                attemptReconnect(deviceId, retriesLeft - 1)
+              }, 2000)
+            } else {
+              _reconnecting = false
+              emit('reconnect_failed', { deviceId: deviceId })
             }
           }
-
-          var tasks = []
-          if (serviceMap.deviceInfo) {
-            tasks.push(discoverChars(deviceId, serviceMap.deviceInfo, 'deviceInfo'))
-          }
-          if (serviceMap.dataComm) {
-            tasks.push(discoverChars(deviceId, serviceMap.dataComm, 'dataComm'))
-          }
-
-          Promise.all(tasks).then(function () {
-            var serviceId = serviceMap.dataComm || null
-            return subscribeToNotifications(deviceId, serviceId)
-          }).then(function () {
-            _reconnecting = false
-            emit('reconnected', { deviceId: deviceId })
-          })
-        },
-        fail: function () {
-          if (retriesLeft > 1) {
-            setTimeout(function () {
-              attemptReconnect(deviceId, retriesLeft - 1)
-            }, 2000)
-          } else {
-            _reconnecting = false
-            emit('reconnect_failed', { deviceId: deviceId })
-          }
-        }
+        })
       })
     },
     fail: function () {
diff --git a/miniprogram/services/ble/index.js b/miniprogram/services/ble/index.js
index 56501a9..dc1c4ed 100644
--- a/miniprogram/services/ble/index.js
+++ b/miniprogram/services/ble/index.js
@@ -38,8 +38,11 @@ module.exports = {
   unbindDevice: commands.unbindDevice,
 
   // Protocol utilities
+  PROTOCOL_MODE: protocol.PROTOCOL_MODE,
   buildFrame: protocol.buildFrame,
   parseFrame: protocol.parseFrame,
+  buildVendorCommand33: protocol.buildVendorCommand33,
+  parseVendorStatus: protocol.parseVendorStatus,
   parseStatusReport: protocol.parseStatusReport,
   parseAck: protocol.parseAck,
   parseTreatmentComplete: protocol.parseTreatmentComplete,
diff --git a/miniprogram/services/ble/protocol.js b/miniprogram/services/ble/protocol.js
index 7a2ef8e..7fe7a64 100644
--- a/miniprogram/services/ble/protocol.js
+++ b/miniprogram/services/ble/protocol.js
@@ -1,5 +1,7 @@
 // BLE protocol: frame encoding/decoding, checksum, constants
 
+var PROTOCOL_MODE = 'vendor_33'
+
 var SERVICE = {
   DEVICE_INFO: 'FFE0',
   DATA_COMM: 'FFE1',
@@ -8,8 +10,8 @@ var SERVICE = {
 
 var CHAR = {
   DEVICE_INFO: 'FFE3',
-  COMMAND: 'FFE4',
-  STATUS: 'FFE5',
+  COMMAND: 'FFE1',
+  STATUS: 'FFE4',
   BOND_INFO: 'FFE6',
   OTA_CONTROL: 'FFE7',
   OTA_DATA: 'FFE8',
@@ -112,6 +114,18 @@ function xorChecksum(bytes) {
   return result
 }
 
+function clampByte(value) {
+  var n = parseInt(value, 10)
+  if (isNaN(n)) n = 0
+  return Math.max(0, Math.min(255, n))
+}
+
+function clampUInt16(value) {
+  var n = parseInt(value, 10)
+  if (isNaN(n)) n = 0
+  return Math.max(0, Math.min(65535, n))
+}
+
 function uint32ToBytes(value) {
   return [
     (value >> 24) & 0xFF,
@@ -141,6 +155,54 @@ function bytesToHex(bytes) {
   return hex.toUpperCase()
 }
 
+// --- vendor 33-byte command protocol ---
+
+function buildVendorCommand33(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 ? brightness : options.current_gain)
+  var durationMs = options.duration_ms || 600000
+  var holdSeconds = clampUInt16(options.hold_time === undefined ? Math.round(durationMs / 1000) : options.hold_time)
+  var regions = [
+    REGION.LEFT_CHEEK,
+    REGION.RIGHT_CHEEK,
+    REGION.FOREHEAD,
+    REGION.CHIN,
+    REGION.NOSE
+  ]
+  var bytes = []
+
+  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
+    }
+    bytes.push(red, infrared, uv, warmYellow, (gain >> 8) & 0xFF, gain & 0xFF)
+  }
+
+  bytes.push((holdSeconds >> 8) & 0xFF, holdSeconds & 0xFF)
+  bytes.push(xorChecksum(bytes))
+  return bytes
+}
+
+function parseVendorStatus(buffer) {
+  var bytes = bufferToBytes(buffer)
+  return {
+    mode_state: bytes.length > 0 ? bytes[0] : MODE_STATE.IDLE,
+    raw_bytes: bytes,
+    raw_hex: bytesToHex(bytes)
+  }
+}
+
 // --- frame encoding/decoding ---
 
 function buildFrame(type, payload) {
@@ -240,6 +302,7 @@ function getModeStateName(code) {
 }
 
 module.exports = {
+  PROTOCOL_MODE: PROTOCOL_MODE,
   SERVICE: SERVICE,
   CHAR: CHAR,
   CMD: CMD,
@@ -258,9 +321,11 @@ module.exports = {
   bytesToUint32: bytesToUint32,
   hexToBytes: hexToBytes,
   bytesToHex: bytesToHex,
+  buildVendorCommand33: buildVendorCommand33,
 
   buildFrame: buildFrame,
   parseFrame: parseFrame,
+  parseVendorStatus: parseVendorStatus,
   parseStatusReport: parseStatusReport,
   parseAck: parseAck,
   parseTreatmentComplete: parseTreatmentComplete,
diff --git a/server/src/dao/user.dao.js b/server/src/dao/user.dao.js
index 6bad3c7..5000c0e 100644
--- a/server/src/dao/user.dao.js
+++ b/server/src/dao/user.dao.js
@@ -1,4 +1,4 @@
-const { query, one, limitClause } = require('../lib/db')
+const { query, one, transaction, limitClause } = require('../lib/db')
 
 /**
  * Find user by WeChat openid
@@ -165,6 +165,42 @@ async function findByIdAdmin(userId) {
   })
 }
 
+/**
+ * Update user status.
+ * @param {number} userId
+ * @param {number} status - 1=active, 2=disabled, 3=cancelled
+ * @returns {Promise<Array>} query result
+ */
+async function updateStatus(userId, status) {
+  return query(
+    'UPDATE users SET status = :status WHERE user_id = :user_id',
+    { user_id: userId, status }
+  )
+}
+
+/**
+ * Soft-cancel a user account and unbind all active devices.
+ * Historical treatment/subscription/log rows are kept.
+ * @param {number} userId
+ * @returns {Promise<{userAffectedRows: number, unboundRows: number}>}
+ */
+async function deactivate(userId) {
+  return transaction(async conn => {
+    const [userResult] = await conn.execute(
+      'UPDATE users SET status = 3 WHERE user_id = ? AND status <> 3',
+      [userId]
+    )
+    const [unbindResult] = await conn.execute(
+      'UPDATE bindings SET bind_status = 2, unbind_time = NOW() WHERE user_id = ? AND bind_status = 1',
+      [userId]
+    )
+    return {
+      userAffectedRows: userResult.affectedRows || 0,
+      unboundRows: unbindResult.affectedRows || 0
+    }
+  })
+}
+
 module.exports = {
   findByOpenid,
   create,
@@ -174,5 +210,7 @@ module.exports = {
   updatePhone,
   listAdmin,
   countAdmin,
-  findByIdAdmin
+  findByIdAdmin,
+  updateStatus,
+  deactivate
 }
diff --git a/server/src/routes/admin.js b/server/src/routes/admin.js
index 3fdc26b..5e10f23 100644
--- a/server/src/routes/admin.js
+++ b/server/src/routes/admin.js
@@ -153,6 +153,37 @@ router.get('/users/:user_id', requireAdmin, wrap(async (req, res) => {
   res.json(ok(result))
 }))
 
+router.post('/users/:user_id/unbind', requireAdmin, wrap(async (req, res) => {
+  const userId = req.params.user_id
+  const targetUser = await userDao.findById(userId)
+  if (!targetUser) return res.json(fail(1004, 'USER_NOT_FOUND'))
+  const deviceId = req.body.device_id ? String(req.body.device_id).trim() : null
+  const result = await bindingDao.unbindByUser(userId, deviceId)
+  await logDao.write({
+    admin_id: req.admin.admin_id,
+    user_id: userId,
+    action: 'admin_user_unbind',
+    detail: '后台解绑用户设备: user=' + userId + ', device=' + (deviceId || 'all'),
+    ip: req.ip
+  })
+  res.json(ok({ message: 'success', affected_rows: result.affectedRows || 0 }))
+}))
+
+router.post('/users/:user_id/deactivate', requireAdmin, wrap(async (req, res) => {
+  const userId = req.params.user_id
+  const targetUser = await userDao.findById(userId)
+  if (!targetUser) return res.json(fail(1004, 'USER_NOT_FOUND'))
+  const result = await userDao.deactivate(userId)
+  await logDao.write({
+    admin_id: req.admin.admin_id,
+    user_id: userId,
+    action: 'admin_user_deactivate',
+    detail: '后台注销用户: user=' + userId + ', unbound=' + result.unboundRows,
+    ip: req.ip
+  })
+  res.json(ok({ message: 'success', unbound_rows: result.unboundRows }))
+}))
+
 // --- Subscriptions ---
 
 router.get('/subscriptions', requireAdmin, wrap(async (req, res) => {