feat: support JW_ device ID format in QR scan and BLE matching

- parseDeviceId accepts hex with spaces (e.g. "672B6D5A 4DCD861")
- BLE scan does exact match on "JW_<device_id>" when target is known
- Manual input placeholder updated to show new format
这个提交包含在:
Guoguo
2026-06-05 19:21:43 -07:00
父节点 9882d19b54
当前提交 810a3a19a5
修改 3 个文件,包含 16 行新增7 行删除
+10 -4
查看文件
@@ -239,6 +239,7 @@ function discoverServices(deviceId, callbacks) {
// --- scan & connect ---
function startScan(callbacks) {
var targetName = callbacks.targetDeviceId ? ('JW_' + callbacks.targetDeviceId).toUpperCase() : ''
wx.openBluetoothAdapter({
success: function () {
wx.startBluetoothDevicesDiscovery({
@@ -251,10 +252,15 @@ function startScan(callbacks) {
var d = devices[i]
var name = (d.name || '').toUpperCase()
var localName = (d.localName || '').toUpperCase()
var matched = name.indexOf('JW_') !== -1 || localName.indexOf('JW_') !== -1 ||
name.indexOf('HOX') !== -1 || localName.indexOf('HOX') !== -1 ||
name.indexOf('LIGHTMASK') !== -1 || localName.indexOf('LIGHTMASK') !== -1 ||
name.indexOf('SIMPLE PERIPHERAL') !== -1 || localName.indexOf('SIMPLE PERIPHERAL') !== -1
var matched = false
if (targetName) {
matched = name === targetName || localName === targetName
} else {
matched = name.indexOf('JW_') !== -1 || localName.indexOf('JW_') !== -1 ||
name.indexOf('HOX') !== -1 || localName.indexOf('HOX') !== -1 ||
name.indexOf('LIGHTMASK') !== -1 || localName.indexOf('LIGHTMASK') !== -1 ||
name.indexOf('SIMPLE PERIPHERAL') !== -1 || localName.indexOf('SIMPLE PERIPHERAL') !== -1
}
if (matched) {
wx.stopBluetoothDevicesDiscovery({})
if (callbacks.onFound) callbacks.onFound(d)