From 79f6c3aac5da1acc38a8f2c992db78892c0ff7c6 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 27 Dec 2023 17:23:41 +0800 Subject: [PATCH] feat:mac null handler --- HDFwear/Tools/BluetoothManager.swift | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/HDFwear/Tools/BluetoothManager.swift b/HDFwear/Tools/BluetoothManager.swift index f5aed84..573694f 100644 --- a/HDFwear/Tools/BluetoothManager.swift +++ b/HDFwear/Tools/BluetoothManager.swift @@ -1574,19 +1574,24 @@ extension BluetoothManager: CBCentralManagerDelegate { delegate.didDiscover(devices: deviceArray) } } else { - // 该设备无值 -// if let json = advertisementData["kCBAdvDataServiceData"] { -// if let dic = json as? Dictionary { -// if let data = dic.values.first { -// var mac = data.hexToString(":") -// mac = mac.substring(fromIndex: mac.length-17) - deviceArray.append(ScanDevice(peripheral, mac: "111")) + if let json = advertisementData["kCBAdvDataServiceData"] { + if let dic = json as? Dictionary { + if let data = dic.values.first { + var mac = data.hexToString(":") + mac = mac.substring(fromIndex: mac.length-17) + deviceArray.append(ScanDevice(peripheral, mac: mac)) for delegate in delegateList { delegate.didDiscover(devices: deviceArray) } -// } -// } -// } + } + } + }else {// 当无值时直接给个值跑通调试 + var mac = "111" + deviceArray.append(ScanDevice(peripheral, mac: mac)) + for delegate in delegateList { + delegate.didDiscover(devices: deviceArray) + } + } } } } -- libgit2 0.21.4