Merge pull request #14 from cslrfid/develop

Develop
cslrfid · Oct 25, 2023 · c1dab95 · c1dab95
2 parents c7f0d4e + b3e4f6d
commit c1dab95
Show file tree

Hide file tree

Showing 12 changed files with 674 additions and 283 deletions.
diff --git a/CS710iOSClient.xcodeproj/project.pbxproj b/CS710iOSClient.xcodeproj/project.pbxproj
@@ -590,7 +590,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -617,7 +617,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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>170</string>
+	<string>250</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>

diff --git a/CS710iOSClient/ViewControllers/CSLDeviceTV.m b/CS710iOSClient/ViewControllers/CSLDeviceTV.m
@@ -236,6 +236,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             [[CSLRfidAppEngine sharedAppEngine].reader stopTriggerKeyAutoReporting];
             [CSLReaderConfigurations setReaderRegionAndFrequencies];
             [CSLReaderConfigurations setAntennaPortsAndPowerForTags:true];
+            [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
             [CSLReaderConfigurations setConfigurationsForTags];
 
             [self->actSpinner stopAnimating];

diff --git a/CS710iOSClient/ViewControllers/CSLHomeVC.m b/CS710iOSClient/ViewControllers/CSLHomeVC.m
@@ -245,7 +245,7 @@ - (IBAction)btnAboutPressed:(id)sender {
 - (IBAction)btnTagAccessPressed:(id)sender {
 
     //if no device is connected, the settings page will not be loaded
-    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING || [CSLRfidAppEngine sharedAppEngine].reader.readerModelNumber == CS710) {
+    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING) {
 
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Reader NOT connected" message:@"Please connect to reader first." preferredStyle:UIAlertControllerStyleAlert];
 
@@ -268,7 +268,7 @@ - (IBAction)btnTagAccessPressed:(id)sender {
 - (IBAction)btnTagSearchPressed:(id)sender {
 
     //if no device is connected, the settings page will not be loaded
-    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING || [CSLRfidAppEngine sharedAppEngine].reader.readerModelNumber == CS710) {
+    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING) {
 
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Reader NOT connected" message:@"Please connect to reader first." preferredStyle:UIAlertControllerStyleAlert];
 
@@ -314,7 +314,7 @@ - (IBAction)btnFunctionsPressed:(id)sender {
 - (IBAction)btnReadTemperaturePressed:(id)sender {
 
     //if no device is connected, the settings page will not be loaded
-    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING || [CSLRfidAppEngine sharedAppEngine].reader.readerModelNumber == CS710) {
+    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING) {
 
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Reader NOT connected" message:@"Please connect to reader first." preferredStyle:UIAlertControllerStyleAlert];
 

diff --git a/CS710iOSClient/ViewControllers/CSLInventoryVC.m b/CS710iOSClient/ViewControllers/CSLInventoryVC.m
@@ -242,6 +242,7 @@ - (void)viewWillAppear:(BOOL)animated {
 
     // Do any additional setup after loading the view.
     [CSLReaderConfigurations setAntennaPortsAndPowerForTags:false];
+    [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
     [CSLReaderConfigurations setConfigurationsForTags];
 }
 
@@ -318,9 +319,6 @@ - (IBAction)btnInventoryPressed:(id)sender {
     {
         [[CSLRfidAppEngine sharedAppEngine] soundAlert:1033];
         btnInventory.enabled=false;
-
-        // Do any additional setup after loading the view.
-        //[((CSLTabVC*)self.tabBarController) setConfigurationsForTags];
 
         //start inventory
         [CSLRfidAppEngine sharedAppEngine].reader.readerTagRate = 0;

diff --git a/CS710iOSClient/ViewControllers/CSLSettingsVC.m b/CS710iOSClient/ViewControllers/CSLSettingsVC.m
@@ -612,6 +612,7 @@ - (IBAction)btnSaveConfigPressed:(id)sender {
 
     [CSLReaderConfigurations setReaderRegionAndFrequencies];
     [CSLReaderConfigurations setAntennaPortsAndPowerForTags:true];
+    [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks];
     [CSLReaderConfigurations setConfigurationsForTags];
 
     [self.actSettingSpinner stopAnimating];