Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Make the library compatible with swift and run BT in the background #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Make the library compatible with swift and run BT in the background #7

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5ec36a
Make the library compatible with swift and run BT in the background
pec1985 Apr 22, 2016
f26ee67
Spaces vs tabs
pec1985 Apr 22, 2016
eb2003a
Missed small detail
pec1985 Apr 22, 2016
1b3215e
made sharedInstance "instancetype" for swift compatibility
pec1985 Apr 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Spaces vs tabs
  • Loading branch information
@pec1985
pec1985 committed Apr 22, 2016
commit f26ee675f99fa65aae6dbdd628f610f051c85492
118 changes: 59 additions & 59 deletions IOS/BlunoBasicDemo/BlunoTest/Bluno/DFBlunoManager.m
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
@interface DFBlunoManager ()
{
BOOL _bSupported;
dispatch_queue_t _backgroundQueue;
dispatch_queue_t _backgroundQueue;
}

@property (strong,nonatomic) CBCentralManager* centralManager;
@@ -28,26 +28,26 @@ @implementation DFBlunoManager

+ (id)sharedInstance
{
static DFBlunoManager* this = nil;
static DFBlunoManager* this = nil;

if (!this)
if (!this)
{
this = [[DFBlunoManager alloc] init];
this = [[DFBlunoManager alloc] init];
this.dicBleDevices = [[NSMutableDictionary alloc] init];
this.dicBlunoDevices = [[NSMutableDictionary alloc] init];
this->_bSupported = NO;
this.runOnMainThread = YES;
this.runOnMainThread = YES;
this.centralManager = [[CBCentralManager alloc]initWithDelegate:this queue:nil];
}

return this;
return this;
}

-(void)setDelegate:(id<DFBlunoDelegate>)aDelegate
{
_delegate = aDelegate;
_backgroundQueue = dispatch_queue_create("dfrobot.bluetooth", DISPATCH_QUEUE_SERIAL);
self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:_backgroundQueue];
_delegate = aDelegate;
_backgroundQueue = dispatch_queue_create("dfrobot.bluetooth", DISPATCH_QUEUE_SERIAL);
self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:_backgroundQueue];

}

@@ -63,14 +63,14 @@ - (void)configureSensorTag:(CBPeripheral*)peripheral
blunoDev->_bReadyToWrite = YES;
if ([((NSObject*)_delegate) respondsToSelector:@selector(readyToCommunicate:)])
{
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate readyToCommunicate:blunoDev];
});
} else {
[_delegate readyToCommunicate:blunoDev];
}
}
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate readyToCommunicate:blunoDev];
});
} else {
[_delegate readyToCommunicate:blunoDev];
}
}

}

@@ -157,13 +157,13 @@ -(void)centralManagerDidUpdateState:(CBCentralManager *)central

if ([((NSObject*)_delegate) respondsToSelector:@selector(bleDidUpdateState:)])
{
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate bleDidUpdateState:_bSupported];
});
} else {
[_delegate bleDidUpdateState:_bSupported];
}
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate bleDidUpdateState:_bSupported];
});
} else {
[_delegate bleDidUpdateState:_bSupported];
}
}

}
@@ -180,13 +180,13 @@ -(void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPerip
if ([((NSObject*)_delegate) respondsToSelector:@selector(didDiscoverDevice:)])
{
DFBlunoDevice* blunoDev = [self.dicBlunoDevices objectForKey:key];
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didDiscoverDevice:blunoDev];
});
} else {
[_delegate didDiscoverDevice:blunoDev];
}
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didDiscoverDevice:blunoDev];
});
} else {
[_delegate didDiscoverDevice:blunoDev];
}
}
}
}
@@ -203,13 +203,13 @@ -(void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPerip

if ([((NSObject*)_delegate) respondsToSelector:@selector(didDiscoverDevice:)])
{
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didDiscoverDevice:blunoDev];
});
} else {
[_delegate didDiscoverDevice:blunoDev];
}
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didDiscoverDevice:blunoDev];
});
} else {
[_delegate didDiscoverDevice:blunoDev];
}
}
}
}
@@ -228,13 +228,13 @@ - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPe
blunoDev->_bReadyToWrite = NO;
if ([((NSObject*)_delegate) respondsToSelector:@selector(didDisconnectDevice:)])
{
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didDisconnectDevice:blunoDev];
});
} else {
[_delegate didDisconnectDevice:blunoDev];
}
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didDisconnectDevice:blunoDev];
});
} else {
[_delegate didDisconnectDevice:blunoDev];
}
}
}

@@ -267,13 +267,13 @@ -(void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CB
{
NSString* key = [peripheral.identifier UUIDString];
DFBlunoDevice* blunoDev = [self.dicBlunoDevices objectForKey:key];
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didReceiveData:characteristic.value device:blunoDev];
});
} else {
[_delegate didReceiveData:characteristic.value device:blunoDev];
}
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didReceiveData:characteristic.value device:blunoDev];
});
} else {
[_delegate didReceiveData:characteristic.value device:blunoDev];
}
}
}

@@ -283,13 +283,13 @@ -(void)peripheral:(CBPeripheral *)peripheral didWriteValueForCharacteristic:(CBC
{
NSString* key = [peripheral.identifier UUIDString];
DFBlunoDevice* blunoDev = [self.dicBlunoDevices objectForKey:key];
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didWriteData:blunoDev];
});
} else {
[_delegate didWriteData:blunoDev];
}
if (self.runOnMainThread) {
dispatch_async(dispatch_get_main_queue(), ^{
[_delegate didWriteData:blunoDev];
});
} else {
[_delegate didWriteData:blunoDev];
}
}

}