Kaynağa Gözat

Fix HMLG search refresh issue

Ray Zhang 2 yıl önce
ebeveyn
işleme
a41ad26b4b

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

@@ -2477,7 +2477,7 @@
 				CODE_SIGN_ENTITLEMENTS = "HMLG Scan Order/HMLG Scan Order.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 54596;
+				CURRENT_PROJECT_VERSION = 54632;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2490,7 +2490,7 @@
 				GCC_PREFIX_HEADER = "HMLG Scan Order/HMLG Scan Order-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/HMLG Scan Order/HMLG Scan Order-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.41;
+				MARKETING_VERSION = 1.42;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2523,7 +2523,7 @@
 				CODE_SIGN_ENTITLEMENTS = "HMLG Scan Order/HMLG Scan Order.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 54596;
+				CURRENT_PROJECT_VERSION = 54632;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2536,7 +2536,7 @@
 				GCC_PREFIX_HEADER = "HMLG Scan Order/HMLG Scan Order-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/HMLG Scan Order/HMLG Scan Order-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 1.41;
+				MARKETING_VERSION = 1.42;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

+ 1 - 0
RedAnt ERP Mobile/HMLG Scan Order/ScanSearchViewController.m

@@ -403,6 +403,7 @@
             
             if([[category_data valueForKey:@"result"] intValue]==2)
             {
+                [self.modellist removeAllObjects];
 //                self.collectionview.hidden=false;
 //                NSDictionary * item_json = [category_data objectForKey:@"items"];
                 

+ 8 - 0
RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/project.pbxproj

@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		3C11D1C82AE0B650003A94DD /* softScanBeep.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3C11D1C72AE0B650003A94DD /* softScanBeep.wav */; };
+		3C11D1CB2AE0BCD3003A94DD /* wrong.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3C11D1C92AE0BCD3003A94DD /* wrong.wav */; };
+		3C11D1CC2AE0BCD3003A94DD /* add.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3C11D1CA2AE0BCD3003A94DD /* add.wav */; };
 		3C2F99B8237BE1790000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */; };
 		3C3300B729430F3E005CFE7C /* commonScanner.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C3300B629430F3E005CFE7C /* commonScanner.storyboard */; };
 		3C3300BA29431141005CFE7C /* CommonScannerSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3300B929431141005CFE7C /* CommonScannerSettingViewController.m */; };
@@ -306,6 +308,8 @@
 
 /* Begin PBXFileReference section */
 		3C11D1C72AE0B650003A94DD /* softScanBeep.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = softScanBeep.wav; path = "ScanApiSDK-10.2.227-2/softScanBeep.wav"; sourceTree = SOURCE_ROOT; };
+		3C11D1C92AE0BCD3003A94DD /* wrong.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = wrong.wav; sourceTree = "<group>"; };
+		3C11D1CA2AE0BCD3003A94DD /* add.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = add.wav; sourceTree = "<group>"; };
 		3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListTableViewCell.m; path = common/Functions/portfolio/PortfolioListTableViewCell.m; sourceTree = SOURCE_ROOT; };
 		3C2F99B7237BE1790000808F /* PortfolioListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListTableViewCell.h; path = common/Functions/portfolio/PortfolioListTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		3C3300B629430F3E005CFE7C /* commonScanner.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = commonScanner.storyboard; sourceTree = "<group>"; };
@@ -1172,6 +1176,8 @@
 			isa = PBXGroup;
 			children = (
 				3C11D1C72AE0B650003A94DD /* softScanBeep.wav */,
+				3C11D1CA2AE0BCD3003A94DD /* add.wav */,
+				3C11D1C92AE0BCD3003A94DD /* wrong.wav */,
 				3CBC872B2A4EBEE600978758 /* ScanRefreshStock.h */,
 				3C3300B529430F0A005CFE7C /* common Scanner */,
 				3C88558E27E1D233005DC3FA /* upload */,
@@ -1962,6 +1968,7 @@
 				7143E220202FD28900451903 /* TearSheet.json in Resources */,
 				71DF74961C57614C00F2789C /* PhotoBorder@2x.png in Resources */,
 				7143E226202FD2CA00451903 /* so_thumb.json in Resources */,
+				3C11D1CC2AE0BCD3003A94DD /* add.wav in Resources */,
 				7165662E1EF3ACD900CB897F /* photostack_image.html in Resources */,
 				3C6831692396094200AD5BD7 /* CommonEditor.iPad.xib in Resources */,
 				3C3C927B2907C0C400EC3500 /* customer_info_template.json in Resources */,
@@ -1970,6 +1977,7 @@
 				7162A55E1C58724700AB630E /* customer_advanced_search.json in Resources */,
 				3C514961273D09E700F78617 /* CommonEditor.storyboard in Resources */,
 				3C68316E2396094200AD5BD7 /* iPadCommonEditorCellAction.xib in Resources */,
+				3C11D1CB2AE0BCD3003A94DD /* wrong.wav in Resources */,
 				7143E22E202FD3CD00451903 /* more_info.html in Resources */,
 				7162A5A11C58733400AB630E /* offline_status_filter_cadedate.json in Resources */,
 				42B309791E45BA32007AFC62 /* status_filter_cadedate_po.json in Resources */,