contrast mobile 2.0 compatible fix

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>HMLG Scan Order.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/common/AppDelegateBase.h

@@ -66,6 +66,9 @@ typedef enum {
 
 #ifdef USE_MFI_SCANNER
     @property (strong, nonatomic) ScanApiHelper* ScanApi;
+    - (void)enableScanner:(bool)enable ;
+// scanner test
+-(void) test_onDecodedDataResult:(NSString*) value;
 #endif
 @property (strong, nonatomic) NSTimer* ScanApiConsumer;
 @property (nonatomic) BOOL doAppDataConfirmation;
@@ -76,15 +79,14 @@ typedef enum {
 @property bool enable_ScannerLog;
 
 @property (strong,nonatomic) NSMutableArray* devices;
-- (void)enableScanner:(bool)enable ;
+
 @property int api_Status;
 @property (strong, nonatomic) NSString* Status_Text;
 
 
 //-(void) didRotated;
 
-// scanner test
--(void) test_onDecodedDataResult:(NSString*) value;
+
 
 //offline order
 -(void) backup_oc;

RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -2966,10 +2966,18 @@ void UncaughtExceptionHandler(NSException *exception) {
         //        UIApplication * app = [UIApplication sharedApplication];
         //        AppDelegate *appDelegate = (AppDelegate *)[app delegate];
         //
+        
+#ifdef USE_MFI_SCANNER
         NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
         bool  autolaunch = [defaults boolForKey:@"EnableScannerOnLaunch"] ;
         if(autolaunch==true)
-            [self enableScanner:autolaunch];
+        {
+            
+                        [self enableScanner:autolaunch];
+
+            
+        }
+#endif
         
     }
     

RedAnt ERP Mobile/common/Functions/sidemenu/ScannerSettingViewController.m

@@ -262,7 +262,7 @@
 //}
 
 - (IBAction)onSwitchChanged:(id)sender {
-    
+#ifdef USE_MFI_SCANNER
 //    [self addlog:@"onSwitchChanged:"];
     
     
@@ -270,9 +270,10 @@
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
     
-    
+
     [appDelegate enableScanner:self.scan_switch.isOn];
     
+#endif
 //    if(self.scan_switch.isOn)
 //    {
 //        [self addlog:@"switch on"];

RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/project.pbxproj

@@ -2357,7 +2357,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 231019;
+				CURRENT_PROJECT_VERSION = 250801;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2372,7 +2372,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.shopping";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries";
-				MARKETING_VERSION = 1.99;
+				MARKETING_VERSION = 2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2405,7 +2405,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 231019;
+				CURRENT_PROJECT_VERSION = 250801;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2420,7 +2420,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.shopping";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries";
-				MARKETING_VERSION = 1.99;
+				MARKETING_VERSION = 2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -2321,7 +2321,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2354628;
+				CURRENT_PROJECT_VERSION = 2557411;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2370,7 +2370,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2354628;
+				CURRENT_PROJECT_VERSION = 2557411;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",