فهرست منبع

Homer App
解决编译报错问题

Ray Zhang 8 سال پیش
والد
کامیت
ec204d8ca6

+ 18 - 0
RedAnt ERP Mobile/iSales-HOMER.xcodeproj/project.pbxproj

@@ -196,6 +196,8 @@
 		716961B519594E1000B19FB4 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 716961B419594E1000B19FB4 /* libsqlite3.dylib */; };
 		716AF8E11D7AA0E0001188E0 /* SelectUploadOrderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 716AF8E01D7AA0E0001188E0 /* SelectUploadOrderViewController.m */; };
 		716AF8E71D7AA398001188E0 /* SelectOrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 716AF8E51D7AA398001188E0 /* SelectOrderTableViewCell.m */; };
+		7173FEAA1FF233E7005A9A82 /* CommonEditorAutoCompleteView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7173FEA71FF233E6005A9A82 /* CommonEditorAutoCompleteView.m */; };
+		7173FEAB1FF233E7005A9A82 /* CommonEditorAutoCompleteView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7173FEA81FF233E6005A9A82 /* CommonEditorAutoCompleteView.xib */; };
 		7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7186C25C1C97A6EE00CB43F4 /* FunctionTestViewController.m */; };
 		718716251C433D8B00F25860 /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716241C433D8B00F25860 /* ExternalAccessory.framework */; };
 		718716271C433D9700F25860 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716261C433D9700F25860 /* AudioToolbox.framework */; };
@@ -638,6 +640,9 @@
 		716AF8E01D7AA0E0001188E0 /* SelectUploadOrderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectUploadOrderViewController.m; path = common/Functions/offline/SelectUploadOrderViewController.m; sourceTree = SOURCE_ROOT; };
 		716AF8E51D7AA398001188E0 /* SelectOrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectOrderTableViewCell.m; path = common/Functions/offline/SelectOrderTableViewCell.m; sourceTree = SOURCE_ROOT; };
 		716AF8E61D7AA398001188E0 /* SelectOrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectOrderTableViewCell.h; path = common/Functions/offline/SelectOrderTableViewCell.h; sourceTree = SOURCE_ROOT; };
+		7173FEA71FF233E6005A9A82 /* CommonEditorAutoCompleteView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommonEditorAutoCompleteView.m; path = ../../../common/customUI/commoneditor/CommonEditorAutoCompleteView.m; sourceTree = "<group>"; };
+		7173FEA81FF233E6005A9A82 /* CommonEditorAutoCompleteView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditorAutoCompleteView.xib; path = ../../../common/customUI/commoneditor/CommonEditorAutoCompleteView.xib; sourceTree = "<group>"; };
+		7173FEA91FF233E7005A9A82 /* CommonEditorAutoCompleteView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommonEditorAutoCompleteView.h; path = ../../../common/customUI/commoneditor/CommonEditorAutoCompleteView.h; sourceTree = "<group>"; };
 		7186C25B1C97A6EE00CB43F4 /* FunctionTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FunctionTestViewController.h; path = common/Functions/sidemenu/FunctionTestViewController.h; sourceTree = SOURCE_ROOT; };
 		7186C25C1C97A6EE00CB43F4 /* FunctionTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FunctionTestViewController.m; path = common/Functions/sidemenu/FunctionTestViewController.m; sourceTree = SOURCE_ROOT; };
 		718716221C433D5000F25860 /* libScanApiCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libScanApiCore.a; path = ../lib/libScanApiCore.a; sourceTree = "<group>"; };
@@ -1572,6 +1577,16 @@
 			name = categoryMenu;
 			sourceTree = "<group>";
 		};
+		7173FEA61FF233DD005A9A82 /* autocomplete */ = {
+			isa = PBXGroup;
+			children = (
+				7173FEA91FF233E7005A9A82 /* CommonEditorAutoCompleteView.h */,
+				7173FEA71FF233E6005A9A82 /* CommonEditorAutoCompleteView.m */,
+				7173FEA81FF233E6005A9A82 /* CommonEditorAutoCompleteView.xib */,
+			);
+			path = autocomplete;
+			sourceTree = "<group>";
+		};
 		717AE10B1D1A5E99007DC5CA /* offline */ = {
 			isa = PBXGroup;
 			children = (
@@ -1860,6 +1875,7 @@
 		71DF743A1C575E6600F2789C /* CommonEditor */ = {
 			isa = PBXGroup;
 			children = (
+				7173FEA61FF233DD005A9A82 /* autocomplete */,
 				42D8CD521FC6619F005BEA15 /* CommonEditorTableContainerView.h */,
 				42D8CD511FC6619E005BEA15 /* CommonEditorTableContainerView.m */,
 				71DF743B1C575E7900F2789C /* CommonEditorCellAction.h */,
@@ -2003,6 +2019,7 @@
 				71DF74951C57614C00F2789C /* PhotoBorder.png in Resources */,
 				7162A55F1C58724700AB630E /* customer_info_template.json in Resources */,
 				42D3A4A21EFA6D36007A54C1 /* PhotoList.storyboard in Resources */,
+				7173FEAB1FF233E7005A9A82 /* CommonEditorAutoCompleteView.xib in Resources */,
 				7141DD3D1C5726B700F7DF59 /* softScanBeep.wav in Resources */,
 				71C1D84B1F456C2200CEA1C9 /* so.json in Resources */,
 				71C1D83D1F456BE800CEA1C9 /* more_info.html in Resources */,
@@ -2180,6 +2197,7 @@
 				7162A5C41C5873BB00AB630E /* ItemSearchViewController.m in Sources */,
 				7162A5481C58719D00AB630E /* RATreeView+TableViewDataSource.m in Sources */,
 				42F1A9231F9DC40D000C0605 /* RAConvertor.m in Sources */,
+				7173FEAA1FF233E7005A9A82 /* CommonEditorAutoCompleteView.m in Sources */,
 				42D3A4A31EFA6D36007A54C1 /* PhotoPreviewCell.m in Sources */,
 				7162A5DB1C5876E300AB630E /* CacheViewController.m in Sources */,
 				7162A5C21C5873BB00AB630E /* FilterCellValue.m in Sources */,

+ 4 - 0
RedAnt ERP Mobile/iSales-HOMER/config.h

@@ -49,6 +49,8 @@
 #ifdef test_server
 
 //------------------- chen server-----------------------
+#define  URL_BACK_ORDER_PREVIEW  @""
+#define  URL_MOVE_TO_BACK_ORDER @""
 #define  URL_BACK_ORDER_PREVIEW @""
 #define  URL_UPDATE_AUTH  @"http://192.168.0.133:8080/site/isales/login.htm"
 #define  URL_LOGOUT  @"http://192.168.0.133:8080/site/isales/loginOut.htm"
@@ -184,6 +186,8 @@
 
 
 //------------------- NPD server-----------------------
+#define  URL_BACK_ORDER_PREVIEW  @""
+#define  URL_MOVE_TO_BACK_ORDER @""
 #define  URL_UPDATE_AUTH  @"https://shopla.homelegance.com/isales/login.htm"
 #define  URL_LOGOUT  @"https://shopla.homelegance.com/isales/loginOut.htm"
 #define  URL_RETRIEVE_PASS  @"https://shopla.homelegance.com/isales/forgotPassword.htm"

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

@@ -1843,7 +1843,6 @@
 		71DF74311C5757C800F2789C /* CommonUI */ = {
 			isa = PBXGroup;
 			children = (
-				4295AE181FE74D26007BE365 /* AutoComplete */,
 				42D3A4981EFA6D36007A54C1 /* PhotoList */,
 				71BF32FA1EFA1C0700842CB4 /* youtube player */,
 				4289800E1E24924D005F1BD8 /* sort */,
@@ -1867,6 +1866,7 @@
 		71DF743A1C575E6600F2789C /* CommonEditor */ = {
 			isa = PBXGroup;
 			children = (
+				4295AE181FE74D26007BE365 /* AutoComplete */,
 				71DF743B1C575E7900F2789C /* CommonEditorCellAction.h */,
 				71DF743C1C575E7900F2789C /* CommonEditorCellAction.m */,
 				71DF743D1C575E7900F2789C /* CommonEditorCellEdit.h */,