diff --git a/CS710iOSClient.xcodeproj/project.pbxproj b/CS710iOSClient.xcodeproj/project.pbxproj index 9f57421..5223b9a 100644 --- a/CS710iOSClient.xcodeproj/project.pbxproj +++ b/CS710iOSClient.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 53; objects = { /* Begin PBXBuildFile section */ @@ -315,7 +315,8 @@ CABA713D21325BF500D15BB1 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1310; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = "Convergence Systems Limited"; TargetAttributes = { CABA714421325BF500D15BB1 = { @@ -589,7 +590,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.7; + MARKETING_VERSION = 0.8; PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -616,7 +617,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.7; + MARKETING_VERSION = 0.8; PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/CS710iOSClient/Info.plist b/CS710iOSClient/Info.plist index 7964054..a71d8b2 100644 --- a/CS710iOSClient/Info.plist +++ b/CS710iOSClient/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 114 + 170 LSRequiresIPhoneOS NSBluetoothAlwaysUsageDescription diff --git a/CS710iOSClient/ViewControllers/CSLDeviceTV.m b/CS710iOSClient/ViewControllers/CSLDeviceTV.m index d22456a..d4107a2 100644 --- a/CS710iOSClient/ViewControllers/CSLDeviceTV.m +++ b/CS710iOSClient/ViewControllers/CSLDeviceTV.m @@ -233,6 +233,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath } } } + [[CSLRfidAppEngine sharedAppEngine].reader stopTriggerKeyAutoReporting]; [CSLReaderConfigurations setReaderRegionAndFrequencies]; [CSLReaderConfigurations setAntennaPortsAndPowerForTags:true]; [CSLReaderConfigurations setConfigurationsForTags]; diff --git a/CS710iOSClient/ViewControllers/CSLHomeVC.m b/CS710iOSClient/ViewControllers/CSLHomeVC.m index b971884..b5fe9a1 100644 --- a/CS710iOSClient/ViewControllers/CSLHomeVC.m +++ b/CS710iOSClient/ViewControllers/CSLHomeVC.m @@ -291,7 +291,7 @@ - (IBAction)btnFunctionsPressed:(id)sender { CSLMoreFunctionsVC * funcVC; //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 index 792d495..be72403 100644 --- a/CS710iOSClient/ViewControllers/CSLInventoryVC.m +++ b/CS710iOSClient/ViewControllers/CSLInventoryVC.m @@ -12,6 +12,7 @@ @interface CSLInventoryVC () { NSTimer * scrRefreshTimer; + NSTimer * scrBeepTimer; UISwipeGestureRecognizer* swipeGestureRecognizer; UIImageView *tempImageView; MQTTCFSocketTransport *transport; @@ -99,7 +100,7 @@ - (void)refreshTagListing { @autoreleasepool { if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==TAG_OPERATIONS) { - [[CSLRfidAppEngine sharedAppEngine] soundAlert:1005]; + //[[CSLRfidAppEngine sharedAppEngine] soundAlert:1005]; //update table [tblTagList reloadData]; @@ -144,6 +145,16 @@ - (void)refreshTagListing { } } +- (void)playBeepSound { + @autoreleasepool { + if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==TAG_OPERATIONS) + { + [[CSLRfidAppEngine sharedAppEngine] soundAlert:1005]; + } + } +} + + - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -176,6 +187,16 @@ - (void)viewWillAppear:(BOOL)animated { repeats:YES]; [[NSRunLoop mainRunLoop] addTimer:scrRefreshTimer forMode:NSRunLoopCommonModes]; + //timer event on beeping during tag read + + scrBeepTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 + target:self + selector:@selector(playBeepSound) + userInfo:nil + repeats:YES]; + [[NSRunLoop mainRunLoop] addTimer:scrBeepTimer forMode:NSRunLoopCommonModes]; + + if ([CSLRfidAppEngine sharedAppEngine].MQTTSettings.isMQTTEnabled) { transport = [[MQTTCFSocketTransport alloc] init]; transport.host = [CSLRfidAppEngine sharedAppEngine].MQTTSettings.brokerAddress; @@ -247,6 +268,9 @@ - (void)viewWillDisappear:(BOOL)animated { [scrRefreshTimer invalidate]; scrRefreshTimer=nil; + [scrBeepTimer invalidate]; + scrBeepTimer=nil; + [CSLRfidAppEngine sharedAppEngine].isBarcodeMode=false; [self.view removeGestureRecognizer:swipeGestureRecognizer]; @@ -302,7 +326,11 @@ - (IBAction)btnInventoryPressed:(id)sender { [CSLRfidAppEngine sharedAppEngine].reader.readerTagRate = 0; tagRangingStartTime=[NSDate date]; [[CSLRfidAppEngine sharedAppEngine].reader setPowerMode:false]; - [[CSLRfidAppEngine sharedAppEngine].reader startInventory]; + if ([CSLRfidAppEngine sharedAppEngine].settings.isMultibank1Enabled && + [CSLRfidAppEngine sharedAppEngine].reader.readerModelNumber == CS710) + [[CSLRfidAppEngine sharedAppEngine].reader E710StartMBInventory]; + else + [[CSLRfidAppEngine sharedAppEngine].reader startInventory]; [btnInventory setTitle:@"Stop" forState:UIControlStateNormal]; btnInventory.enabled=true; } diff --git a/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.m b/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.m index a487dc2..426c459 100644 --- a/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.m +++ b/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.m @@ -53,7 +53,10 @@ - (IBAction)btnMultibankPressed:(id)sender { - (IBAction)btnFiltersPressed:(id)sender { CSLFilterTabVC * tabVC = (CSLFilterTabVC*)[[UIStoryboard storyboardWithName:@"CSLRfidDemoApp" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"ID_FilterTabVC"]; - + + if ([CSLRfidAppEngine sharedAppEngine].reader.readerModelNumber == CS710) + return; + [tabVC setActiveView:CSL_VC_RFIDTAB_PREFILTER_VC_IDX]; self.view.userInteractionEnabled=false; if (tabVC != nil) @@ -66,7 +69,7 @@ - (IBAction)btnFiltersPressed:(id)sender { - (IBAction)btnMQTTPressed:(id)sender { CSLMQTTClientSettings* mqttSettings; mqttSettings = (CSLMQTTClientSettings*)[[UIStoryboard storyboardWithName:@"CSLRfidDemoApp" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"ID_MQTTSettingsVC"]; - + if (mqttSettings != nil) { [[self navigationController] pushViewController:mqttSettings animated:YES]; diff --git a/CS710iOSClient/ViewControllers/CSLTagAccessVC.m b/CS710iOSClient/ViewControllers/CSLTagAccessVC.m index 68ad7d7..dd85323 100644 --- a/CS710iOSClient/ViewControllers/CSLTagAccessVC.m +++ b/CS710iOSClient/ViewControllers/CSLTagAccessVC.m @@ -95,10 +95,9 @@ - (void)viewWillAppear:(BOOL)animated { self.txtPower.text=[NSString stringWithFormat:@"%d", [CSLRfidAppEngine sharedAppEngine].settings.power]; // Do any additional setup after loading the view. - //[((CSLTabVC*)self.tabBarController) setAntennaPortsAndPowerForTagAccess]; - //[((CSLTabVC*)self.tabBarController) setConfigurationsForTags]; [CSLReaderConfigurations setAntennaPortsAndPowerForTagAccess:false]; [CSLReaderConfigurations setConfigurationsForTags]; + [CSLReaderConfigurations setConfigurationsForClearAllSelectionsAndMultibanks]; } - (void)viewWillDisappear:(BOOL)animated { diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index ec12b8f..5b98f86 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 53; objects = { /* Begin PBXBuildFile section */ @@ -644,7 +644,7 @@ LastUpgradeCheck = 1300; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; - compatibilityVersion = "Xcode 10.0"; + compatibilityVersion = "Xcode 11.4"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = (