diff --git a/hooks/useBluetoothDiscovery.js b/hooks/useBluetoothDiscovery.js index d3f0918..9168aa0 100644 --- a/hooks/useBluetoothDiscovery.js +++ b/hooks/useBluetoothDiscovery.js @@ -12,7 +12,7 @@ import { showToast } from '@/utils/toast' const FILTER_SCAN_TIMEOUT_MS = 4000 const RESTART_SCAN_DELAY_MS = 120 const DISCOVERY_POLL_INTERVAL_MS = 1200 -const TARGET_NAME_KEYWORDS = Object.freeze(['ED713', '713WQ', 'ED719']) +const TARGET_NAME_KEYWORDS = Object.freeze(['ED713', '713WQ', 'ED719','EP832']) function promisifyUniApi(apiName, params = {}) { return new Promise((resolve, reject) => { @@ -121,7 +121,7 @@ export function createBluetoothDiscovery(options = {}) { return DEVICE_PROFILE.ED719 } - if (text.includes('ED713')) { + if (text.includes('713WQ')) { return DEVICE_PROFILE.ED713 } diff --git a/pages/device/config.vue b/pages/device/config.vue index ab9b455..e5afc2e 100644 --- a/pages/device/config.vue +++ b/pages/device/config.vue @@ -27,12 +27,14 @@ {{ device.showName }} 00F4 - 名称匹配 + 名称匹配 + {{ device.deviceId }} - - {{ wifiPreparing ? '鉴权中' : '网络配置' }} + + {{ isDevicePreparing(device.deviceId) ? '鉴权中' : '网络配置' }} 参数配置 服务器配置 @@ -54,7 +56,10 @@ - *WiFi名称 + + * + WiFi名称 + - *WiFi密码 + + * + WiFi密码 +