From fd90950f8ff3a0647afa8bf8486e241641e2eedb Mon Sep 17 00:00:00 2001 From: 17792275749 <812100002@qq.com> Date: Wed, 27 May 2026 09:46:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(service):=20=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=8E=BB=E9=99=A4=20[LeFu]=20=E5=89=8D?= =?UTF-8?q?=E7=BC=80=EF=BC=8C=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 --- miniprogram/lefu/service.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/miniprogram/lefu/service.ts b/miniprogram/lefu/service.ts index 479297c..0da8cfc 100644 --- a/miniprogram/lefu/service.ts +++ b/miniprogram/lefu/service.ts @@ -264,10 +264,10 @@ class LeFuService { console.log(TAG, 'getWifiList()') return new Promise((resolve, reject) => { if (!this._activeProtocol) { - reject(new Error('[LeFu] 设备未连接,无法获取 WiFi 列表')) + reject(new Error('设备未连接,无法获取 WiFi 列表')) return } - const timer = setTimeout(() => reject(new Error('[LeFu] 获取 WiFi 列表超时')), 15000) + const timer = setTimeout(() => reject(new Error('获取 WiFi 列表超时')), 15000) setTimeout(() => { this._activeProtocol.dataFindSurroundDevice((res: any[]) => { clearTimeout(timer) @@ -290,7 +290,7 @@ class LeFuService { return new Promise((resolve, reject) => { if (!this._activeProtocol) { console.warn(TAG, 'configWifi 早期 reject:_activeProtocol 为空') - reject(new Error('[LeFu] 设备未连接,无法配网')) + reject(new Error('设备未连接,无法配网')) return } let settled = false @@ -298,7 +298,7 @@ class LeFuService { console.warn(TAG, 'configWifi 超时触发 elapsed=', Date.now() - startTs, 'settled=', settled) if (settled) return settled = true - reject(new Error('[LeFu] 配网超时,请重试')) + reject(new Error('配网超时,请重试')) }, 20000) console.log(TAG, 'configWifi 已注册 20s 定时器 timerId=', timer) const callback = (res: number, ...extra: any[]) => { @@ -306,7 +306,7 @@ class LeFuService { if (settled) return settled = true clearTimeout(timer) - res === 23 ? resolve() : reject(new Error(`[LeFu] 配网失败,错误码:${res}`)) + res === 23 ? resolve() : reject(new Error(`配网失败,错误码:${res}`)) } if (version === 'domain1') { console.log(TAG, 'domain1 dataConfigNetWork') @@ -323,7 +323,7 @@ class LeFuService { checkWifiConfig(): Promise { return new Promise((resolve, reject) => { - if (!this._activeProtocol) { reject(new Error('[LeFu] 设备未连接')); return } + if (!this._activeProtocol) { reject(new Error('设备未连接')); return } this._activeProtocol.codeFetchWifiConfig((res: number | undefined | null) => { resolve(res === 0x01) }) @@ -333,8 +333,8 @@ class LeFuService { // ─── OTA 升级 ───────────────────────────────── checkAndUpgrade(): Promise { return new Promise((resolve, reject) => { - if (!this._activeProtocol) { reject(new Error('[LeFu] 设备未连接')); return } - if (!this._deviceInfo) { reject(new Error('[LeFu] 固件信息未就绪')); return } + if (!this._activeProtocol) { reject(new Error('设备未连接')); return } + if (!this._deviceInfo) { reject(new Error('固件信息未就绪')); return } const { firmwareRevision, modelNumber } = this._deviceInfo const [mcuVer, bleVer, wifiVer, resVer] = (firmwareRevision || '').split('.') @@ -352,7 +352,7 @@ class LeFuService { if (!needUpdate) { resolve(false); return } this._activeProtocol.codeOtaUpdate((status: number) => { console.log(`codeOtaUpdatecodeOtaUpdatecodeOtaUpdate ${status}`) - status != 0 ? reject(new Error('[LeFu] OTA 升级失败')) : resolve(true) + status != 0 ? reject(new Error('OTA 升级失败')) : resolve(true) }) }) .catch(reject) @@ -402,20 +402,20 @@ class LeFuService { // ─── 成员同步 ───────────────────────────────── syncMembersToDevice(members: DeviceMember[], onProgress?: (current: number, total: number) => void): Promise { return new Promise((resolve, reject) => { - if (!this._activeProtocol) { reject(new Error('[LeFu] 设备未连接')); return } + if (!this._activeProtocol) { reject(new Error('设备未连接')); return } const mainUser = members.find(m => m.isSelf) - if (!mainUser) { reject(new Error('[LeFu] 缺少主用户')); return } + if (!mainUser) { reject(new Error('缺少主用户')); return } - const clearTimer = setTimeout(() => reject(new Error('[LeFu] 清除设备成员超时')), 15000) + const clearTimer = setTimeout(() => reject(new Error('清除设备成员超时')), 15000) this._activeProtocol.codeClearDeviceData('01', (clearRes: number) => { clearTimeout(clearTimer) - if (clearRes != 0) { reject(new Error('[LeFu] 清除设备成员失败')); return } + if (clearRes != 0) { reject(new Error('清除设备成员失败')); return } let index = 0 let syncTimer: number | null = null const resetTimer = () => { if (syncTimer !== null) clearTimeout(syncTimer) - syncTimer = setTimeout(() => reject(new Error(`[LeFu] 第 ${index + 1} 个成员下发超时`)), 15000) + syncTimer = setTimeout(() => reject(new Error(`第 ${index + 1} 个成员下发超时`)), 15000) } const syncNext = () => { if (index >= members.length) {