Merge pull request #15 from cslrfid/develop

Develop
cslrfid · Nov 26, 2023 · 620c202 · 620c202
2 parents c1dab95 + a9ba297
commit 620c202
Show file tree

Hide file tree

Showing 13 changed files with 285 additions and 184 deletions.
diff --git a/CS710iOSClient.xcodeproj/project.pbxproj b/CS710iOSClient.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -578,7 +578,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = ZDHT9HGJF7;
+				DEVELOPMENT_TEAM = 67RT9ZRG3Y;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -590,7 +590,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -605,7 +605,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = ZDHT9HGJF7;
+				DEVELOPMENT_TEAM = 67RT9ZRG3Y;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -617,7 +617,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/CS710iOSClient/Assets.xcassets/authentication.imageset/Contents.json b/CS710iOSClient/Assets.xcassets/authentication.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "authentication.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/CS710iOSClient/Assets.xcassets/authentication.imageset/authentication.png b/CS710iOSClient/Assets.xcassets/authentication.imageset/authentication.png
diff --git a/CS710iOSClient/CSLRfidDemoApp.storyboard b/CS710iOSClient/CSLRfidDemoApp.storyboard
diff --git a/CS710iOSClient/Info.plist b/CS710iOSClient/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>250</string>
+	<string>376</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>

diff --git a/CS710iOSClient/ViewControllers/CSLHomeVC.m b/CS710iOSClient/ViewControllers/CSLHomeVC.m
@@ -117,9 +117,6 @@ - (IBAction)btnInventoryPressed:(id)sender {
         [self presentViewController:alert animated:YES completion:nil];
     }
     else {
-        [self.actHomeSpinner startAnimating];
-        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.0]];
-        self.view.userInteractionEnabled=false;
         [self showTabInterfaceActiveView:CSL_VC_RFIDTAB_INVENTORY_VC_IDX];
     }
 
@@ -254,9 +251,6 @@ - (IBAction)btnTagAccessPressed:(id)sender {
         [self presentViewController:alert animated:YES completion:nil];
     }
     else {
-        [self.actHomeSpinner startAnimating];
-        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.0]];
-        self.view.userInteractionEnabled=false;
         [self showTabInterfaceActiveView:CSL_VC_RFIDTAB_ACCESS_VC_IDX];
     }
 
@@ -277,9 +271,6 @@ - (IBAction)btnTagSearchPressed:(id)sender {
         [self presentViewController:alert animated:YES completion:nil];
     }
     else {
-        [self.actHomeSpinner startAnimating];
-        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.0]];
-        self.view.userInteractionEnabled=false;
         [self showTabInterfaceActiveView:CSL_VC_RFIDTAB_SEARCH_VC_IDX];
     }
 
@@ -323,9 +314,6 @@ - (IBAction)btnReadTemperaturePressed:(id)sender {
         [self presentViewController:alert animated:YES completion:nil];
     }
     else {
-        [self.actHomeSpinner startAnimating];
-        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.0]];
-        self.view.userInteractionEnabled=false;
         [self showTemperatureTabInterfaceActiveView:CSL_VC_TEMPTAB_READTEMP_VC_IDX];
     }
 

diff --git a/CS710iOSClient/ViewControllers/CSLInventoryVC.m b/CS710iOSClient/ViewControllers/CSLInventoryVC.m
@@ -240,10 +240,18 @@ - (void)viewWillAppear:(BOOL)animated {
                 [self->uivSendTagData setHidden:true];
     }
 
+    self.view.userInteractionEnabled=false;
+    [self.actInventorySpinner startAnimating];
+
+}
+
+- (void)viewDidAppear:(BOOL)animated {
     // Do any additional setup after loading the view.
     [CSLReaderConfigurations setAntennaPortsAndPowerForTags:false];
     [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
     [CSLReaderConfigurations setConfigurationsForTags];
+    self.view.userInteractionEnabled=true;
+    [self.actInventorySpinner stopAnimating];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {

diff --git a/CS710iOSClient/ViewControllers/CSLTagAccessVC.m b/CS710iOSClient/ViewControllers/CSLTagAccessVC.m
@@ -93,12 +93,24 @@ - (void)viewWillAppear:(BOOL)animated {
     }
 
     self.txtPower.text=[NSString stringWithFormat:@"%d", [CSLRfidAppEngine sharedAppEngine].settings.power];
+
+    [self.actTagAccessSpinner startAnimating];
+    self.view.userInteractionEnabled=false;
 
+}
+
+- (void)viewDidAppear:(BOOL)animated {
     // Do any additional setup after loading the view.
     [CSLReaderConfigurations setAntennaPortsAndPowerForTagAccess:false];
     [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
     [CSLReaderConfigurations setConfigurationsForTags];
-
+    self.view.userInteractionEnabled=true;
+    [self.actTagAccessSpinner stopAnimating];
+
+    self.btnRead.enabled=true;
+    self.btnWrite.enabled=true;
+    self.btnSecurity.enabled=true;
+    self.btnKill.enabled=true;
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -241,8 +253,12 @@ - (IBAction)btnUserWordPressed:(id)sender {
 - (IBAction)btnReadPressed:(id)sender {
 
     @autoreleasepool {
+        self.btnRead.enabled=false;
         self.btnWrite.enabled=false;
         self.btnSecurity.enabled=false;
+        self.btnKill.enabled=false;
+        [self.actTagAccessSpinner startAnimating];
+        self.view.userInteractionEnabled=false;
 
         BOOL result=true;
         Byte tidWordCount =[[[self.btnTidUidWord titleLabel].text substringFromIndex:5] intValue];
@@ -535,16 +551,24 @@ - (IBAction)btnReadPressed:(id)sender {
         [alert addAction:ok];
         [self presentViewController:alert animated:YES completion:nil];
 
+        self.btnRead.enabled=true;
         self.btnWrite.enabled=true;
         self.btnSecurity.enabled=true;
+        self.btnKill.enabled=true;
 
+        [self.actTagAccessSpinner stopAnimating];
+        self.view.userInteractionEnabled=true;
     }
 }
 
 - (IBAction)btnWritePressed:(id)sender {
     @autoreleasepool {
         self.btnRead.enabled=false;
+        self.btnWrite.enabled=false;
         self.btnSecurity.enabled=false;
+        self.btnKill.enabled=false;
+        [self.actTagAccessSpinner startAnimating];
+        self.view.userInteractionEnabled=false;
 
         BOOL result=true;
         Byte userWordCount = [[[self.btnUserWord titleLabel].text substringFromIndex:5] intValue];
@@ -842,7 +866,12 @@ - (IBAction)btnWritePressed:(id)sender {
         [self presentViewController:alert animated:YES completion:nil];
 
         self.btnRead.enabled=true;
+        self.btnWrite.enabled=true;
         self.btnSecurity.enabled=true;
+        self.btnKill.enabled=true;
+
+        [self.actTagAccessSpinner stopAnimating];
+        self.view.userInteractionEnabled=true;
     }
 
 }

diff --git a/CS710iOSClient/ViewControllers/CSLTagKillVC.m b/CS710iOSClient/ViewControllers/CSLTagKillVC.m
@@ -127,7 +127,8 @@ - (void) didReceiveTagResponsePacket: (CSLBleReader *) sender tagReceived:(CSLBl
 }
 - (void) didReceiveTagAccessData:(CSLBleReader *)sender tagReceived:(CSLBleTag *)tag {
     if ([CSLRfidAppEngine sharedAppEngine].reader.readerModelNumber == CS710 && tag.AccessCommand == KILL) {
-        if (tag.AccessError == 0x10 && tag.BackScatterError == 0x00) {
+        //a killed tag would have 0x00 (No error) or 0x04 (no access reply) as the tag has already been killed
+        if (tag.AccessError == 0x10 && (tag.BackScatterError == 0x00 ||tag.BackScatterError == 0x04)) {
             killCommandAccepted=true;
         }
         killCommandCompleted=true;

diff --git a/CS710iOSClient/ViewControllers/CSLTagSearchVC.m b/CS710iOSClient/ViewControllers/CSLTagSearchVC.m
@@ -60,10 +60,17 @@ - (void)viewWillAppear:(BOOL)animated {
 
     rollingAvgRssi = [[CSLCircularQueue alloc] initWithCapacity:ROLLING_AVG_COUNT];
 
+    [self.actSearchSpinner startAnimating];
+    self.view.userInteractionEnabled=false;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
     // Do any additional setup after loading the view.
     [CSLReaderConfigurations setAntennaPortsAndPowerForTagSearch:false];
     [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
     [CSLReaderConfigurations setConfigurationsForTags];
+    self.view.userInteractionEnabled=true;
+    [self.actSearchSpinner stopAnimating];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {

diff --git a/CS710iOSClient/ViewControllers/CSLTemperatureReadVC.h b/CS710iOSClient/ViewControllers/CSLTemperatureReadVC.h
@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UITableView *tblTagList;
 @property (weak, nonatomic) IBOutlet UILabel *lbTagCount;
 @property (weak, nonatomic) IBOutlet UILabel *lbInventory;
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *actLoading;
 
 - (IBAction)btnInventoryPressed:(id)sender;
 - (IBAction)btnSelectAllTagPressed:(id)sender;

diff --git a/CS710iOSClient/ViewControllers/CSLTemperatureReadVC.m b/CS710iOSClient/ViewControllers/CSLTemperatureReadVC.m
@@ -21,11 +21,6 @@ @implementation CSLTemperatureReadVC
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    // Do any additional setup after loading the view.
-    [CSLReaderConfigurations setAntennaPortsAndPowerForTemperatureTags:false];
-    [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
-    [CSLReaderConfigurations setConfigurationsForTemperatureTags];
-
     //initialize averaging buffer
     [CSLRfidAppEngine sharedAppEngine].temperatureSettings.temperatureAveragingBuffer = [[NSMutableDictionary alloc] init];
     [CSLRfidAppEngine sharedAppEngine].temperatureSettings.lastGoodReadBuffer = [[NSMutableDictionary alloc] init];
@@ -74,13 +69,18 @@ - (void)viewWillAppear:(BOOL)animated {
     [self.tblTagList setEditing:true animated:true];
     self.tblTagList.backgroundView = nil;
     self.tblTagList.backgroundColor = [UIColor whiteColor];
-
+
+    [self.actLoading startAnimating];
+    self.view.userInteractionEnabled=false;
 
 }
 - (void)viewDidAppear:(BOOL)animated {
-
-
-
+    // Do any additional setup after loading the view.
+    [CSLReaderConfigurations setAntennaPortsAndPowerForTemperatureTags:false];
+    [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
+    [CSLReaderConfigurations setConfigurationsForTemperatureTags];
+    self.view.userInteractionEnabled=true;
+    [self.actLoading stopAnimating];
 }
 /*
 #pragma mark - Navigation

diff --git a/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks.sh b/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks.sh