From 9a6e394246936fe0c1cda33477cf19db9bdd06ef Mon Sep 17 00:00:00 2001 From: Jesse Katsumata Date: Fri, 21 Jun 2019 07:49:03 +0900 Subject: [PATCH] :bug: fix argument of addCharacteristicToSErviceIOS --- ios/RNBLEPeripheral.m | 4 ++-- ios/RNBLEPeripheral.swift | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ios/RNBLEPeripheral.m b/ios/RNBLEPeripheral.m index 61e3bc6..140f41e 100644 --- a/ios/RNBLEPeripheral.m +++ b/ios/RNBLEPeripheral.m @@ -19,10 +19,10 @@ @interface RCT_EXTERN_MODULE(BLEPeripheral, RCTEventEmitter) primary: (BOOL)primary ) RCT_EXTERN_METHOD( - addCharacteristicToService: (NSString *)uuid + addCharacteristicToService: (NSString *)serviceUUID + uuid: (NSString *)uuid permissions: (NSInteger *)permissions properties: (NSInteger *)properties - data: (NSString *)data ) RCT_EXTERN_METHOD( start: diff --git a/ios/RNBLEPeripheral.swift b/ios/RNBLEPeripheral.swift index 27c5925..2e71cc8 100644 --- a/ios/RNBLEPeripheral.swift +++ b/ios/RNBLEPeripheral.swift @@ -45,13 +45,12 @@ class BLEPeripheral: RCTEventEmitter, CBPeripheralManagerDelegate { } } - @objc(addCharacteristicToService:uuid:permissions:properties:data:) - func addCharacteristicToService(_ serviceUUID: String, uuid: String, permissions: UInt, properties: UInt, data: String) { + @objc(addCharacteristicToService:uuid:permissions:properties:) + func addCharacteristicToService(_ serviceUUID: String, uuid: String, permissions: UInt, properties: UInt) { let characteristicUUID = CBUUID(string: uuid) let propertyValue = CBCharacteristicProperties(rawValue: properties) let permissionValue = CBAttributePermissions(rawValue: permissions) - let byteData: Data = data.data(using: .utf8)! - let characteristic = CBMutableCharacteristic( type: characteristicUUID, properties: propertyValue, value: byteData, permissions: permissionValue) + let characteristic = CBMutableCharacteristic( type: characteristicUUID, properties: propertyValue, value: nil, permissions: permissionValue) servicesMap[serviceUUID]?.characteristics?.append(characteristic) print("added characteristic to service") }