refactor(service): 错误提示去除 [LeFu] 前缀,优化用户体验
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
5ddf45951d
commit
fd90950f8f
+14
-14
@@ -264,10 +264,10 @@ class LeFuService {
|
|||||||
console.log(TAG, 'getWifiList()')
|
console.log(TAG, 'getWifiList()')
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
if (!this._activeProtocol) {
|
if (!this._activeProtocol) {
|
||||||
reject(new Error('[LeFu] 设备未连接,无法获取 WiFi 列表'))
|
reject(new Error('设备未连接,无法获取 WiFi 列表'))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const timer = setTimeout(() => reject(new Error('[LeFu] 获取 WiFi 列表超时')), 15000)
|
const timer = setTimeout(() => reject(new Error('获取 WiFi 列表超时')), 15000)
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this._activeProtocol.dataFindSurroundDevice((res: any[]) => {
|
this._activeProtocol.dataFindSurroundDevice((res: any[]) => {
|
||||||
clearTimeout(timer)
|
clearTimeout(timer)
|
||||||
@@ -290,7 +290,7 @@ class LeFuService {
|
|||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
if (!this._activeProtocol) {
|
if (!this._activeProtocol) {
|
||||||
console.warn(TAG, 'configWifi 早期 reject:_activeProtocol 为空')
|
console.warn(TAG, 'configWifi 早期 reject:_activeProtocol 为空')
|
||||||
reject(new Error('[LeFu] 设备未连接,无法配网'))
|
reject(new Error('设备未连接,无法配网'))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
let settled = false
|
let settled = false
|
||||||
@@ -298,7 +298,7 @@ class LeFuService {
|
|||||||
console.warn(TAG, 'configWifi 超时触发 elapsed=', Date.now() - startTs, 'settled=', settled)
|
console.warn(TAG, 'configWifi 超时触发 elapsed=', Date.now() - startTs, 'settled=', settled)
|
||||||
if (settled) return
|
if (settled) return
|
||||||
settled = true
|
settled = true
|
||||||
reject(new Error('[LeFu] 配网超时,请重试'))
|
reject(new Error('配网超时,请重试'))
|
||||||
}, 20000)
|
}, 20000)
|
||||||
console.log(TAG, 'configWifi 已注册 20s 定时器 timerId=', timer)
|
console.log(TAG, 'configWifi 已注册 20s 定时器 timerId=', timer)
|
||||||
const callback = (res: number, ...extra: any[]) => {
|
const callback = (res: number, ...extra: any[]) => {
|
||||||
@@ -306,7 +306,7 @@ class LeFuService {
|
|||||||
if (settled) return
|
if (settled) return
|
||||||
settled = true
|
settled = true
|
||||||
clearTimeout(timer)
|
clearTimeout(timer)
|
||||||
res === 23 ? resolve() : reject(new Error(`[LeFu] 配网失败,错误码:${res}`))
|
res === 23 ? resolve() : reject(new Error(`配网失败,错误码:${res}`))
|
||||||
}
|
}
|
||||||
if (version === 'domain1') {
|
if (version === 'domain1') {
|
||||||
console.log(TAG, 'domain1 dataConfigNetWork')
|
console.log(TAG, 'domain1 dataConfigNetWork')
|
||||||
@@ -323,7 +323,7 @@ class LeFuService {
|
|||||||
|
|
||||||
checkWifiConfig(): Promise<boolean> {
|
checkWifiConfig(): Promise<boolean> {
|
||||||
return new Promise((resolve, reject) => {
|
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) => {
|
this._activeProtocol.codeFetchWifiConfig((res: number | undefined | null) => {
|
||||||
resolve(res === 0x01)
|
resolve(res === 0x01)
|
||||||
})
|
})
|
||||||
@@ -333,8 +333,8 @@ class LeFuService {
|
|||||||
// ─── OTA 升级 ─────────────────────────────────
|
// ─── OTA 升级 ─────────────────────────────────
|
||||||
checkAndUpgrade(): Promise<boolean> {
|
checkAndUpgrade(): Promise<boolean> {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
if (!this._activeProtocol) { reject(new Error('[LeFu] 设备未连接')); return }
|
if (!this._activeProtocol) { reject(new Error('设备未连接')); return }
|
||||||
if (!this._deviceInfo) { reject(new Error('[LeFu] 固件信息未就绪')); return }
|
if (!this._deviceInfo) { reject(new Error('固件信息未就绪')); return }
|
||||||
|
|
||||||
const { firmwareRevision, modelNumber } = this._deviceInfo
|
const { firmwareRevision, modelNumber } = this._deviceInfo
|
||||||
const [mcuVer, bleVer, wifiVer, resVer] = (firmwareRevision || '').split('.')
|
const [mcuVer, bleVer, wifiVer, resVer] = (firmwareRevision || '').split('.')
|
||||||
@@ -352,7 +352,7 @@ class LeFuService {
|
|||||||
if (!needUpdate) { resolve(false); return }
|
if (!needUpdate) { resolve(false); return }
|
||||||
this._activeProtocol.codeOtaUpdate((status: number) => {
|
this._activeProtocol.codeOtaUpdate((status: number) => {
|
||||||
console.log(`codeOtaUpdatecodeOtaUpdatecodeOtaUpdate ${status}`)
|
console.log(`codeOtaUpdatecodeOtaUpdatecodeOtaUpdate ${status}`)
|
||||||
status != 0 ? reject(new Error('[LeFu] OTA 升级失败')) : resolve(true)
|
status != 0 ? reject(new Error('OTA 升级失败')) : resolve(true)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.catch(reject)
|
.catch(reject)
|
||||||
@@ -402,20 +402,20 @@ class LeFuService {
|
|||||||
// ─── 成员同步 ─────────────────────────────────
|
// ─── 成员同步 ─────────────────────────────────
|
||||||
syncMembersToDevice(members: DeviceMember[], onProgress?: (current: number, total: number) => void): Promise<void> {
|
syncMembersToDevice(members: DeviceMember[], onProgress?: (current: number, total: number) => void): Promise<void> {
|
||||||
return new Promise((resolve, reject) => {
|
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)
|
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) => {
|
this._activeProtocol.codeClearDeviceData('01', (clearRes: number) => {
|
||||||
clearTimeout(clearTimer)
|
clearTimeout(clearTimer)
|
||||||
if (clearRes != 0) { reject(new Error('[LeFu] 清除设备成员失败')); return }
|
if (clearRes != 0) { reject(new Error('清除设备成员失败')); return }
|
||||||
|
|
||||||
let index = 0
|
let index = 0
|
||||||
let syncTimer: number | null = null
|
let syncTimer: number | null = null
|
||||||
const resetTimer = () => {
|
const resetTimer = () => {
|
||||||
if (syncTimer !== null) clearTimeout(syncTimer)
|
if (syncTimer !== null) clearTimeout(syncTimer)
|
||||||
syncTimer = setTimeout(() => reject(new Error(`[LeFu] 第 ${index + 1} 个成员下发超时`)), 15000)
|
syncTimer = setTimeout(() => reject(new Error(`第 ${index + 1} 个成员下发超时`)), 15000)
|
||||||
}
|
}
|
||||||
const syncNext = () => {
|
const syncNext = () => {
|
||||||
if (index >= members.length) {
|
if (index >= members.length) {
|
||||||
|
|||||||
Reference in New Issue
Block a user