Merge pull request #6 from cslrfid/develop

Revised page comments
cslrfid · Jan 16, 2023 · 0f4efc8 · 0f4efc8
2 parents ae660de + d4d0f62
commit 0f4efc8
Show file tree

Hide file tree

Showing 53 changed files with 57 additions and 72 deletions.
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>67</string>
+	<string>72</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>

diff --git a/CS710iOSClient/ViewControllers/AppDelegate.h b/CS710iOSClient/ViewControllers/AppDelegate.h
@@ -1,6 +1,6 @@
 //
 //  AppDelegate.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 25/8/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/AppDelegate.m b/CS710iOSClient/ViewControllers/AppDelegate.m
@@ -1,6 +1,6 @@
 //
 //  AppDelegate.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 25/8/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLAboutVC.h b/CS710iOSClient/ViewControllers/CSLAboutVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLAboutVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 23/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLAboutVC.m b/CS710iOSClient/ViewControllers/CSLAboutVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLAboutVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 23/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLAntennaPortVC.h b/CS710iOSClient/ViewControllers/CSLAntennaPortVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLAntennaPortVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2019-11-01.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLAntennaPortVC.m b/CS710iOSClient/ViewControllers/CSLAntennaPortVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLAntennaPortVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2019-11-01.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLDeviceTV.h b/CS710iOSClient/ViewControllers/CSLDeviceTV.h
@@ -1,6 +1,6 @@
 //
 //  CSLDeviceTV.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 18/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLDeviceTV.m b/CS710iOSClient/ViewControllers/CSLDeviceTV.m
@@ -1,6 +1,6 @@
 //
 //  CSLDeviceTV.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 18/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLFilterTabVC.h b/CS710iOSClient/ViewControllers/CSLFilterTabVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLFilterTabVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-03-16.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLFilterTabVC.m b/CS710iOSClient/ViewControllers/CSLFilterTabVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLFilterTabVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-03-16.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLHomeVC.m b/CS710iOSClient/ViewControllers/CSLHomeVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLHomeVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 15/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.
@@ -138,9 +138,6 @@ - (void)showTabInterfaceActiveView:(int)identifier
 
 - (void)showTemperatureTabInterfaceActiveView:(int)identifier
 {
-    //Temperorily disable feature
-    return;
-
     CSLTemperatureTabVC * tabVC = (CSLTemperatureTabVC*)[[UIStoryboard storyboardWithName:@"CSLRfidDemoApp" bundle:[NSBundle mainBundle]] instantiateViewControllerWithIdentifier:@"ID_TempTabVC"];
     [tabVC setActiveView:identifier];
 
@@ -246,11 +243,8 @@ - (IBAction)btnAboutPressed:(id)sender {
 
 - (IBAction)btnTagAccessPressed:(id)sender {
 
-    //Temperorily disable feature
-    return;
-
     //if no device is connected, the settings page will not be loaded
-    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING) {
+    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==CONNECTED) {
 
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Reader NOT connected" message:@"Please connect to reader first." preferredStyle:UIAlertControllerStyleAlert];
 
@@ -272,11 +266,8 @@ - (IBAction)btnTagAccessPressed:(id)sender {
 
 - (IBAction)btnTagSearchPressed:(id)sender {
 
-    //Temperorily disable feature
-    return;
-
     //if no device is connected, the settings page will not be loaded
-    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING) {
+    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==CONNECTED) {
 
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Reader NOT connected" message:@"Please connect to reader first." preferredStyle:UIAlertControllerStyleAlert];
 
@@ -297,12 +288,9 @@ - (IBAction)btnTagSearchPressed:(id)sender {
 
 - (IBAction)btnFunctionsPressed:(id)sender {
 
-    //Temperorily disable feature
-    return;
-
     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) {
+    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==CONNECTED) {
 
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Reader NOT connected" message:@"Please connect to reader first." preferredStyle:UIAlertControllerStyleAlert];
 
@@ -324,11 +312,8 @@ - (IBAction)btnFunctionsPressed:(id)sender {
 
 - (IBAction)btnReadTemperaturePressed:(id)sender {
 
-    //Temperorily disable feature
-    return;
-
     //if no device is connected, the settings page will not be loaded
-    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING) {
+    if ([CSLRfidAppEngine sharedAppEngine].reader.connectStatus==NOT_CONNECTED || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==SCANNING || [CSLRfidAppEngine sharedAppEngine].reader.connectStatus==CONNECTED) {
 
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Reader NOT connected" message:@"Please connect to reader first." preferredStyle:UIAlertControllerStyleAlert];
 

diff --git a/CS710iOSClient/ViewControllers/CSLInventoryVC.h b/CS710iOSClient/ViewControllers/CSLInventoryVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLInventoryVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 15/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLInventoryVC.m b/CS710iOSClient/ViewControllers/CSLInventoryVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLInventoryVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 15/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLMQTTClientSettings.h b/CS710iOSClient/ViewControllers/CSLMQTTClientSettings.h
@@ -1,6 +1,6 @@
 //
 //  CSLMQTTClientSettings.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 7/1/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLMQTTClientSettings.m b/CS710iOSClient/ViewControllers/CSLMQTTClientSettings.m
@@ -1,6 +1,6 @@
 //
 //  CSLMQTTClientSettings.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 7/1/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.h b/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLMoreFunctionsVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 19/2/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.m b/CS710iOSClient/ViewControllers/CSLMoreFunctionsVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLMoreFunctionsVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 19/2/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLMultibankAccessVC.h b/CS710iOSClient/ViewControllers/CSLMultibankAccessVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLMultibankAccessVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 20/2/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLMultibankAccessVC.m b/CS710iOSClient/ViewControllers/CSLMultibankAccessVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLMultibankAccessVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 20/2/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLPostfilterVC.h b/CS710iOSClient/ViewControllers/CSLPostfilterVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLPostfilterVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-03-16.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLPostfilterVC.m b/CS710iOSClient/ViewControllers/CSLPostfilterVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLPostfilterVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-03-16.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLPowerLevelVC.h b/CS710iOSClient/ViewControllers/CSLPowerLevelVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLPowerLevelVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2019-10-31.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLPowerLevelVC.m b/CS710iOSClient/ViewControllers/CSLPowerLevelVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLPowerLevelVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2019-10-31.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLPrefilterVC.h b/CS710iOSClient/ViewControllers/CSLPrefilterVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLPrefilterVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-03-16.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLPrefilterVC.m b/CS710iOSClient/ViewControllers/CSLPrefilterVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLPrefilterVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-03-16.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLSettingsVC.h b/CS710iOSClient/ViewControllers/CSLSettingsVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLSettingsVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 15/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLSettingsVC.m b/CS710iOSClient/ViewControllers/CSLSettingsVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLSettingsVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 15/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTabVC.h b/CS710iOSClient/ViewControllers/CSLTabVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLTabVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 15/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTabVC.m b/CS710iOSClient/ViewControllers/CSLTabVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLTabVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 15/9/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagAccessVC.h b/CS710iOSClient/ViewControllers/CSLTagAccessVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLTagAccessVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 16/10/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagAccessVC.m b/CS710iOSClient/ViewControllers/CSLTagAccessVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLTagAccessController.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 16/10/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagKillVC.h b/CS710iOSClient/ViewControllers/CSLTagKillVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLTagKillVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-10-30.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagKillVC.m b/CS710iOSClient/ViewControllers/CSLTagKillVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLTagKillVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 2021-10-30.
 //  Copyright © 2021 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagListCell.h b/CS710iOSClient/ViewControllers/CSLTagListCell.h
@@ -1,6 +1,6 @@
 //
 //  CSLTagListCell.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 18/2/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagListCell.m b/CS710iOSClient/ViewControllers/CSLTagListCell.m
@@ -1,6 +1,6 @@
 //
 //  CSLTagListCell.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 18/2/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagLockVC.h b/CS710iOSClient/ViewControllers/CSLTagLockVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLTagLockVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 30/12/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagLockVC.m b/CS710iOSClient/ViewControllers/CSLTagLockVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLTagLockVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 30/12/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagSearchVC.h b/CS710iOSClient/ViewControllers/CSLTagSearchVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLTagSearchVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 18/12/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTagSearchVC.m b/CS710iOSClient/ViewControllers/CSLTagSearchVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLTagSearchVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 18/12/2018.
 //  Copyright © 2018 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTemperatureDetailsVC.h b/CS710iOSClient/ViewControllers/CSLTemperatureDetailsVC.h
@@ -1,6 +1,6 @@
 //
 //  CSLTemperatureDetailsVC.h
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 4/3/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.

diff --git a/CS710iOSClient/ViewControllers/CSLTemperatureDetailsVC.m b/CS710iOSClient/ViewControllers/CSLTemperatureDetailsVC.m
@@ -1,6 +1,6 @@
 //
 //  CSLTemperatureDetailsVC.m
-//  CS108iOSClient
+//  CS710SiOSClient
 //
 //  Created by Lam Ka Shun on 4/3/2019.
 //  Copyright © 2019 Convergence Systems Limited. All rights reserved.