Merge pull request #16 from cslrfid/develop

Release version S3.7 Build 329

Author: ksclam

CS108iOSClient.xcodeproj/project.pbxproj

@@ -640,7 +640,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 320;
 				DEVELOPMENT_TEAM = ZDHT9HGJF7;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -652,7 +651,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = S3.6;
+				MARKETING_VERSION = S3.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
 				PRODUCT_NAME = CS108Swift;
 				SWIFT_OBJC_BRIDGING_HEADER = "CS108iOSClient/ViewControllers/CS108iOSClient-Bridging-Header.h";
@@ -669,7 +668,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 320;
 				DEVELOPMENT_TEAM = ZDHT9HGJF7;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -681,7 +679,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = S3.6;
+				MARKETING_VERSION = S3.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
 				PRODUCT_NAME = CS108Swift;
 				SWIFT_OBJC_BRIDGING_HEADER = "CS108iOSClient/ViewControllers/CS108iOSClient-Bridging-Header.h";

CS108iOSClient.xcworkspace/xcuserdata/TurtleMac01.xcuserdatad/UserInterfaceState.xcuserstate

@@ -39,6 +39,30 @@ typedef NS_ENUM(Byte, STATUS) {
 - (void) didInterfaceChangeConnectStatus: (CSLBleInterface *) sender;     //triggered when reader state chagnes
 @end //end protocol
 
+@protocol CSLBleScanDelegate <NSObject>   //define delegate protocol
+@optional
+/**
+ This will be triggered when a new device being discovered
+ @param deviceDiscovered CBPeripheral object of the device discovered
+ */
+- (void) deviceListWasUpdated: (CBPeripheral *) deviceDiscovered;     //triggered when reader state chagnes
+/**
+ This will be triggered when a device is being connected
+ @param deviceConnected CBPeripheral object of the device connected
+ */
+- (void) didConnectToDevice: (CBPeripheral *) deviceConnected;     //triggered when reader connect to device
+/**
+ This will be triggered when a  device being disconnected
+ @param deviceDisconnected CBPeripheral object of the device disconnected
+ */
+- (void) didDisconnectDevice: (CBPeripheral *) deviceDisconnected;     //triggered when reader connect to device
+/**
+ This will be triggered when a device failed to connect
+ @param deviceFailedToConnect CBPeripheral object of the device disconnected
+ */
+- (void) didFailedToConnect: (CBPeripheral *) deviceFailedToConnect;     //triggered when reader connect to device
+@end //end protocol
+
 /**
  Low-level Bluetooth LE communication using Apple Core Bluetooth framework
  */
@@ -63,6 +87,7 @@ typedef NS_ENUM(Byte, STATUS) {
 @property (readonly) STATUS connectStatus;
 ///instance of the CSLBleInterfaceDelegate delegate
 @property (nonatomic, weak) id <CSLBleInterfaceDelegate> delegate; //define CSLBleReaderDelegate as delegate
+@property (nonatomic, weak) id <CSLBleScanDelegate> scanDelegate; //define CSLBleScanDelegate as delegate
 
 /**
  initialization selector that:

CS108iOSClient/CSLReader/CSLBleInterface.h

@@ -30,6 +30,7 @@ @implementation CSLBleInterface
 @synthesize deviceListName;
 
 @synthesize delegate; //synthesize CSLBleInterfaceDelegate delegate
+@synthesize scanDelegate; //synthesize CSLBleScanDelegate delegate
 
 - (id) init
 {
@@ -240,6 +241,7 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
         if( ![bleDeviceList containsObject:peripheral] ) {
             [deviceListName addObject:peripheralName];
             [peripherals addObject:peripheral];
+            [self.scanDelegate deviceListWasUpdated:peripheral];
         }
     }
 
@@ -279,6 +281,7 @@ - (void)centralManager:(CBCentralManager *)central didConnectPeripheral:(CBPerip
 
     [peripheral setDelegate:self];
     [peripheral discoverServices:nil];
+    [self.scanDelegate didConnectToDevice:peripheral];
 }
 
 /*
@@ -291,6 +294,7 @@ - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPe
     @synchronized(self) {
         connectStatus = NOT_CONNECTED;
         [self.delegate didInterfaceChangeConnectStatus:self]; //this will call the method for connections status chagnes.
+        [self.scanDelegate didDisconnectDevice:peripheral];
         if( bleDevice )
         {
             [bleDevice setDelegate:nil];
@@ -304,7 +308,8 @@ - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPe
  */
 - (void)centralManager:(CBCentralManager *)central didFailToConnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error
 {
-    NSLog(@"Fail to connect to peripheral: %@ with error = %@", peripheral, [error localizedDescription]);\
+    NSLog(@"Fail to connect to peripheral: %@ with error = %@", peripheral, [error localizedDescription]);
+    [self.scanDelegate didFailedToConnect:peripheral];
     if( bleDevice )
     {
         [bleDevice setDelegate:nil];

CS108iOSClient/CSLReader/CSLBleInterface.m

@@ -103,6 +103,12 @@ typedef NS_ENUM(Byte, READERTYPE)
  @param tag Reference to the CSLBleTag object being returned
  */
 - (void) didReceiveTagAccessData: (CSLBleReader *) sender tagReceived:(CSLBleTag*)tag;  //define delegate method to be implemented within another class
+@optional
+/**
+ This will be triggered when reader receives a command-end packet during its operations
+ @param sender CSLBleReader object of the connected reader
+ */
+- (void) didReceiveCommandEndResponse: (CSLBleReader *) sender;  //define delegate method to be implemented within another class
 @end //end protocol
 
 /**