Преглед изворни кода

hmlg scan order 1.16, 去掉物理扫描枪支持

Ray Zhang пре 3 година
родитељ
комит
c678064675

+ 10 - 6
RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -88,6 +88,7 @@
 		3CABBF122836224500FA3352 /* guest.json in Resources */ = {isa = PBXBuildFile; fileRef = 3CABBF112836224400FA3352 /* guest.json */; };
 		3CABE0202861A51F00CF0DC1 /* StockViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CABE01F2861A51E00CF0DC1 /* StockViewController.m */; };
 		3CABE0232861A5E000CF0DC1 /* StockTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CABE0222861A5E000CF0DC1 /* StockTableViewCell.m */; };
+		3CB44F1028733D6D00E24494 /* libScanApiCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CB44F0F28733D1200E24494 /* libScanApiCore.a */; };
 		3CC1122B279163F4004ACA57 /* offline_order_new_contact.json in Resources */ = {isa = PBXBuildFile; fileRef = 3CC1122A279163F4004ACA57 /* offline_order_new_contact.json */; };
 		3CD54A79282CF21D0073A15D /* ScanHomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD54A78282CF21D0073A15D /* ScanHomeViewController.m */; };
 		3CD54A7C282CF4930073A15D /* ScanHomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD54A7B282CF4930073A15D /* ScanHomeCell.m */; };
@@ -294,7 +295,6 @@
 		718716251C433D8B00F25860 /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716241C433D8B00F25860 /* ExternalAccessory.framework */; };
 		718716271C433D9700F25860 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716261C433D9700F25860 /* AudioToolbox.framework */; };
 		718716291C433DA400F25860 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716281C433DA400F25860 /* AVFoundation.framework */; };
-		7187162C1C43428100F25860 /* libScanApiCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716221C433D5000F25860 /* libScanApiCore.a */; };
 		7195623C1CF57D1800C74A49 /* CategoryHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7195623B1CF57D1800C74A49 /* CategoryHeaderView.m */; };
 		71BBA2271CEAC16000C91DED /* ZipArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71BBA2221CEAC16000C91DED /* ZipArchive.mm */; };
 		71BBA2291CEAC17E00C91DED /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 71BBA2281CEAC17E00C91DED /* libz.tbd */; };
@@ -478,6 +478,8 @@
 		3CABE01F2861A51E00CF0DC1 /* StockViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StockViewController.m; sourceTree = "<group>"; };
 		3CABE0212861A5E000CF0DC1 /* StockTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StockTableViewCell.h; sourceTree = "<group>"; };
 		3CABE0222861A5E000CF0DC1 /* StockTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StockTableViewCell.m; sourceTree = "<group>"; };
+		3CB44F0E28733CEC00E24494 /* ScanAPI.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = ScanAPI.podspec; path = "ScanApiSDK-10.2.227-2/ScanAPI.podspec"; sourceTree = "<group>"; };
+		3CB44F0F28733D1200E24494 /* libScanApiCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libScanApiCore.a; path = "ScanApiSDK-10.2.227-2/lib/libScanApiCore.a"; sourceTree = "<group>"; };
 		3CC1122A279163F4004ACA57 /* offline_order_new_contact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = offline_order_new_contact.json; path = common/Functions/contact/offline_order_new_contact.json; sourceTree = SOURCE_ROOT; };
 		3CD54A77282CF21D0073A15D /* ScanHomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScanHomeViewController.h; sourceTree = "<group>"; };
 		3CD54A78282CF21D0073A15D /* ScanHomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ScanHomeViewController.m; sourceTree = "<group>"; };
@@ -951,8 +953,8 @@
 				42D9A0231EB02DA6008AF7AF /* AdSupport.framework in Frameworks */,
 				42BEF35F1E89FEE300632AB6 /* CoreData.framework in Frameworks */,
 				42BEF35D1E89FECD00632AB6 /* SystemConfiguration.framework in Frameworks */,
+				3CB44F1028733D6D00E24494 /* libScanApiCore.a in Frameworks */,
 				71BBA2291CEAC17E00C91DED /* libz.tbd in Frameworks */,
-				7187162C1C43428100F25860 /* libScanApiCore.a in Frameworks */,
 				42BEF3551E89FE1200632AB6 /* GGLCore.framework in Frameworks */,
 				718716291C433DA400F25860 /* AVFoundation.framework in Frameworks */,
 				718716271C433D9700F25860 /* AudioToolbox.framework in Frameworks */,
@@ -1354,6 +1356,8 @@
 		42BEF35B1E89FECC00632AB6 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				3CB44F0F28733D1200E24494 /* libScanApiCore.a */,
+				3CB44F0E28733CEC00E24494 /* ScanAPI.podspec */,
 				42D9A0221EB02DA6008AF7AF /* AdSupport.framework */,
 				42BEF35E1E89FEE300632AB6 /* CoreData.framework */,
 				42BEF35C1E89FECD00632AB6 /* SystemConfiguration.framework */,
@@ -2713,7 +2717,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51373;
+				CURRENT_PROJECT_VERSION = 51391;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2730,7 +2734,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.15;
+				MARKETING_VERSION = 1.16;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2757,7 +2761,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51373;
+				CURRENT_PROJECT_VERSION = 51391;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2774,7 +2778,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.15;
+				MARKETING_VERSION = 1.16;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

+ 1 - 3
RedAnt ERP Mobile/HMLG Scan Order/HMLG Scan Order-Info.plist

@@ -53,9 +53,7 @@
 	<key>UIRequiresFullScreen</key>
 	<true/>
 	<key>UISupportedExternalAccessoryProtocols</key>
-	<array>
-		<string>com.socketmobile.chs</string>
-	</array>
+	<array/>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

+ 1 - 1
RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -57,7 +57,7 @@
        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
        [dateFormatter setDateFormat:@"yyyy-MM-dd"];
 
-NSDate * ddate =[dateFormatter dateFromString:@"2022-07-10"];
+NSDate * ddate =[dateFormatter dateFromString:@"2022-07-9"];
     
 //    bool review=[cdate earlierDate:ddate];
     NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];