yangjie/bluetooth_low_energy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复写入特征值无法完成和重启蓝牙后调用外围设备方法报错的问题 (#20)

Browse Source 
* fix: 修复示例代码问题

* fix: 断开连接时清理缓存

* fix: 修复蓝牙重新打开后 GATT server 失效的问题

* fix: 修复问题

* fix: 修复写入特征值无法完成的问题

* fix: 修改版本号
This commit is contained in:
Mr剑侠客
2023-10-12 18:29:03 +08:00
committed by GitHub
parent 5d87dbc129
commit 4bec1c9f3a
161 changed files with 11133 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bluetooth_low_energy_darwin/darwin/Classes/MyCentralManager.swift
View File

@ -229,7 +229,11 @@ class MyCentralManager: MyCentralManagerHostApi {
}
let type = typeArgs.toWriteType()
peripheral.writeValue(data, for: characteristic, type: type)
writeCharacteristicCompletions[characteristicHashCodeArgs] = completion
if type == .withResponse {
writeCharacteristicCompletions[characteristicHashCodeArgs] = completion
} else {
completion(.success(()))
}
} catch {
completion(.failure(error))
}
@ -353,11 +357,18 @@ class MyCentralManager: MyCentralManagerHostApi {
discoverGattCompletion?(.failure(error ?? MyError.unknown))
unfinishedServices.removeValue(forKey: peripheralHashCodeArgs)
unfinishedCharacteristics.removeValue(forKey: peripheralHashCodeArgs)
let servicesArgs = servicesArgsOfPeripheralsArgs[peripheralHashCodeArgs] ?? []
let servicesArgs = servicesArgsOfPeripheralsArgs.removeValue(forKey: peripheralHashCodeArgs) ?? []
for serviceArgs in servicesArgs {
let serviceHashCodeArgs = serviceArgs.hashCodeArgs
let service = services.removeValue(forKey: serviceHashCodeArgs)!
let serviceHashCode = service.hash
self.servicesArgs.removeValue(forKey: serviceHashCode)
let characteristicsArgs = serviceArgs.characteristicsArgs.map { args in args! }
for characteristicArgs in characteristicsArgs {
let characteristicHashCodeArgs = characteristicArgs.hashCodeArgs
let characteristic = characteristics.removeValue(forKey: characteristicHashCodeArgs)!
let characteristicHashCode = characteristic.hash
self.characteristicsArgs.removeValue(forKey: characteristicHashCode)
let readCharacteristicCompletion = readCharacteristicCompletions.removeValue(forKey: characteristicHashCodeArgs)
let writeCharacteristicCompletion = writeCharacteristicCompletions.removeValue(forKey: characteristicHashCodeArgs)
let notifyCharacteristicCompletion = notifyCharacteristicCompletions.removeValue(forKey: characteristicHashCodeArgs)
@ -367,6 +378,9 @@ class MyCentralManager: MyCentralManagerHostApi {
let descriptorsArgs = characteristicArgs.descriptorsArgs.map { args in args! }
for descriptorArgs in descriptorsArgs {
let descriptorHashCodeArgs = descriptorArgs.hashCodeArgs
let descriptor = descriptors.removeValue(forKey: descriptorHashCodeArgs)!
let descriptorHashCode = descriptor.hash
self.descriptorsArgs.removeValue(forKey: descriptorHashCode)
let readDescriptorCompletion = readDescriptorCompletions.removeValue(forKey: descriptorHashCodeArgs)
let writeDescriptorCompletion = writeDescriptorCompletions.removeValue(forKey: descriptorHashCodeArgs)
readDescriptorCompletion?(.failure(error ?? MyError.unknown))