diff --git a/BabyBluetooth.podspec b/BabyBluetooth.podspec index bdd9940..94e8cfc 100644 --- a/BabyBluetooth.podspec +++ b/BabyBluetooth.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = "BabyBluetooth" - s.version = "0.5.0" + s.version = "0.6.0" s.summary = "bluetooth library on ios/osx" s.description = <<-DESC @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.license = "MIT" s.author = { "liuyanwei" => "coolnameismy@hotmail.com" } - s.source = { :git => "https://github.com/coolnameismy/BabyBluetooth.git", :tag => "0.5.0" } + s.source = { :git => "https://github.com/coolnameismy/BabyBluetooth.git", :tag => "0.6.0" } s.platform = :ios, "7.0" s.requires_arc = true diff --git a/Classes/objc/BabyBluetooth.h b/Classes/objc/BabyBluetooth.h index 5bd4edd..38f818e 100644 --- a/Classes/objc/BabyBluetooth.h +++ b/Classes/objc/BabyBluetooth.h @@ -3,7 +3,7 @@ 简单易用的蓝牙ble库,基于CoreBluetooth 作者:刘彦玮 https://github.com/coolnameismy/BabyBluetooth - version:0.5.0+ + version:0.6.0 */ // Created by 刘彦玮 on 15/3/31. diff --git a/Classes/objc/BabyCallback.h b/Classes/objc/BabyCallback.h index 05bd418..2724cfd 100644 --- a/Classes/objc/BabyCallback.h +++ b/Classes/objc/BabyCallback.h @@ -42,19 +42,19 @@ typedef void (^BBCancelScanBlock)(CBCentralManager *centralManager); typedef void (^BBCancelAllPeripheralsConnectionBlock)(CBCentralManager *centralManager); -typedef void (^BBDidWriteValueForCharacteristic)(CBCharacteristic *characteristic,NSError *error); +typedef void (^BBDidWriteValueForCharacteristicBlock)(CBCharacteristic *characteristic,NSError *error); -typedef void (^BBDidWriteValueForDescriptor)(CBDescriptor *descriptor,NSError *error); +typedef void (^BBDidWriteValueForDescriptorBlock)(CBDescriptor *descriptor,NSError *error); -typedef void (^BBDidUpdateNotificationStateForCharacteristic)(CBCharacteristic *characteristic,NSError *error); +typedef void (^BBDidUpdateNotificationStateForCharacteristicBlock)(CBCharacteristic *characteristic,NSError *error); -typedef void (^BBDidReadRSSI)(NSNumber *RSSI,NSError *error); +typedef void (^BBDidReadRSSIBlock)(NSNumber *RSSI,NSError *error); -typedef void (^BBDidDiscoverIncludedServicesForService)(CBService *service,NSError *error); +typedef void (^BBDidDiscoverIncludedServicesForServiceBlock)(CBService *service,NSError *error); -typedef void (^BBDidUpdateName)(CBPeripheral *peripheral); +typedef void (^BBDidUpdateNameBlock)(CBPeripheral *peripheral); -typedef void (^BBDidModifyServices)(CBPeripheral *peripheral,NSArray *invalidatedServices); +typedef void (^BBDidModifyServicesBlock)(CBPeripheral *peripheral,NSArray *invalidatedServices); //peripheral model @@ -90,25 +90,21 @@ typedef void (^BBPeripheralModelDidUnSubscribeToCharacteristic)(CBPeripheralMana //获取Characteristics的名称 @property (nonatomic, copy) BBDiscoverDescriptorsForCharacteristicBlock blockOnDiscoverDescriptorsForCharacteristic; //获取Descriptors的值 - - - @property (nonatomic,copy) BBReadValueForDescriptorsBlock blockOnReadValueForDescriptors; -#warning fix 委托后面加上block的后缀 -@property (nonatomic, copy) BBDidWriteValueForCharacteristic blockOnDidWriteValueForCharacteristic; +@property (nonatomic, copy) BBDidWriteValueForCharacteristicBlock blockOnDidWriteValueForCharacteristic; -@property (nonatomic, copy) BBDidWriteValueForDescriptor blockOnDidWriteValueForDescriptor; +@property (nonatomic, copy) BBDidWriteValueForDescriptorBlock blockOnDidWriteValueForDescriptor; -@property (nonatomic, copy) BBDidUpdateNotificationStateForCharacteristic blockOnDidUpdateNotificationStateForCharacteristic; +@property (nonatomic, copy) BBDidUpdateNotificationStateForCharacteristicBlock blockOnDidUpdateNotificationStateForCharacteristic; -@property (nonatomic, copy) BBDidReadRSSI blockOnDidReadRSSI; +@property (nonatomic, copy) BBDidReadRSSIBlock blockOnDidReadRSSI; -@property (nonatomic, copy) BBDidDiscoverIncludedServicesForService blockOnDidDiscoverIncludedServicesForService; +@property (nonatomic, copy) BBDidDiscoverIncludedServicesForServiceBlock blockOnDidDiscoverIncludedServicesForService; -@property (nonatomic, copy) BBDidUpdateName blockOnDidUpdateName; +@property (nonatomic, copy) BBDidUpdateNameBlock blockOnDidUpdateName; -@property (nonatomic, copy) BBDidModifyServices blockOnDidModifyServices; +@property (nonatomic, copy) BBDidModifyServicesBlock blockOnDidModifyServices; //babyBluettooth stopScan方法调用后的回调