Răsfoiți Sursa

20170123

HMLG 1.0 BUILD 170120
Ray Zhang 9 ani în urmă
părinte
comite
1b9fad9702

+ 5 - 5
RedAnt ERP Mobile/HMLG Mobile.xcodeproj/project.pbxproj

@@ -195,8 +195,6 @@
 		7183EA411CF2A04D00524787 /* OLM.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7183EA401CF2A04D00524787 /* OLM.storyboard */; };
 		7183EA441CF2A06600524787 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7183EA431CF2A06600524787 /* Main.storyboard */; };
 		7183EA471CF2A06E00524787 /* iSalesNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183EA461CF2A06E00524787 /* iSalesNavigationController.m */; };
-		7183EA4B1CF2A1F300524787 /* Pods.debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 7183EA481CF2A1F300524787 /* Pods.debug.xcconfig */; };
-		7183EA4C1CF2A1F300524787 /* Pods.release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 7183EA491CF2A1F300524787 /* Pods.release.xcconfig */; };
 		7183EA4E1CF2A6DF00524787 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7183EA4D1CF2A6DF00524787 /* libz.tbd */; };
 		7183EA501CF2A70800524787 /* libScanApiCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7183EA4F1CF2A70800524787 /* libScanApiCore.a */; };
 		7183EA521CF2A71A00524787 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7183EA511CF2A71A00524787 /* AVFoundation.framework */; };
@@ -1443,7 +1441,7 @@
 		7183E83C1CF2913E00524787 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "United Software Applications, Inc";
 				TargetAttributes = {
 					7183E8431CF2913E00524787 = {
@@ -1476,7 +1474,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				716AF8DE1D792157001188E0 /* offline_status_filter_cadedate.json in Resources */,
-				7183EA4C1CF2A1F300524787 /* Pods.release.xcconfig in Resources */,
 				7183E8571CF2913E00524787 /* LaunchScreen.storyboard in Resources */,
 				7183E8541CF2913E00524787 /* Assets.xcassets in Resources */,
 				7183EA1B1CF29FCB00524787 /* status_filter_cadedate_open.json in Resources */,
@@ -1490,7 +1487,6 @@
 				719562441CF6937F00C74A49 /* default_appearance.json in Resources */,
 				7183E8A21CF29F3900524787 /* LICENSE in Resources */,
 				7183E8FE1CF29F4500524787 /* PhotoBorder@2x.png in Resources */,
-				7183EA4B1CF2A1F300524787 /* Pods.debug.xcconfig in Resources */,
 				7183EA031CF29FCB00524787 /* customer_advanced_search.json in Resources */,
 				7183E8FD1CF29F4500524787 /* PhotoBorder.png in Resources */,
 				42BB2F081E28986B0025C6CE /* signature.storyboard in Resources */,
@@ -1734,8 +1730,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1785,8 +1783,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

+ 1 - 1
RedAnt ERP Mobile/HMLG Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcschemes/HMLG Mobile.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

+ 1 - 1
RedAnt ERP Mobile/HMLG Mobile/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>160728</string>
+	<string>170120</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

+ 66 - 66
RedAnt ERP Mobile/HMLG Mobile/config.h

@@ -16,7 +16,7 @@
 
 #define CONTACT_LIST 1
 
-#define test_server
+//#define test_server
 #import "Singleton.h"
 #define notifyMe_switch 1
 #define exception_switch 1
@@ -173,98 +173,98 @@
 #define URL_NOTIFY_ME @""
 
 //------------------- HMLG TEST server-----------------------
-#define  URL_UPDATE_AUTH  @"http://207.140.24.83/isales/login.htm"
-#define  URL_LOGOUT  @"http://207.140.24.83/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://207.140.24.83/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"https://erp.homelegance.com/isales/login.htm"
+#define  URL_LOGOUT  @"https://erp.homelegance.com/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"https://erp.homelegance.com/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://207.140.24.83/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://207.140.24.83/isales/homePage.htm"
-#define  URL_CATEGORY @"http://207.140.24.83/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://207.140.24.83/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://207.140.24.83/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://207.140.24.83/isales/categoryMore.htm"
+#define  URL_REQUEST_CATMENU  @"https://erp.homelegance.com/isales/menu.htm"
+#define  URL_LOAD_HOME  @"https://erp.homelegance.com/isales/homePage.htm"
+#define  URL_CATEGORY @"https://erp.homelegance.com/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"https://erp.homelegance.com/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"https://erp.homelegance.com/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"https://erp.homelegance.com/isales/categoryMore.htm"
 
 
 
-#define  URL_ORDER_LIST  @"http://207.140.24.83/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://207.140.24.83/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://207.140.24.83/isales/createOrder.htm"
-#define URL_SAVE_ORDER @"http://207.140.24.83/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://207.140.24.83/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://207.140.24.83/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://207.140.24.83/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://207.140.24.83/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://207.140.24.83/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://207.140.24.83/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"https://erp.homelegance.com/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"https://erp.homelegance.com/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"https://erp.homelegance.com/isales/createOrder.htm"
+#define URL_SAVE_ORDER @"https://erp.homelegance.com/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"https://erp.homelegance.com/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"https://erp.homelegance.com/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"https://erp.homelegance.com/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"https://erp.homelegance.com/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"https://erp.homelegance.com/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"https://erp.homelegance.com/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://207.140.24.83/isales/setPrice.htm"
-#define  URL_CART_INCRESEMENT  @"http://207.140.24.83/isales/increment.htm"
-#define  URL_CART  @"http://207.140.24.83/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://207.140.24.83/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://207.140.24.83/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://207.140.24.83/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://207.140.24.83/isales/checkCartItem.htm"
+#define  URL_CART_SET_PRICE  @"https://erp.homelegance.com/isales/setPrice.htm"
+#define  URL_CART_INCRESEMENT  @"https://erp.homelegance.com/isales/increment.htm"
+#define  URL_CART  @"https://erp.homelegance.com/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"https://erp.homelegance.com/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"https://erp.homelegance.com/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"https://erp.homelegance.com/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"https://erp.homelegance.com/isales/checkCartItem.htm"
 
-#define  URL_CART2WISH  @"http://207.140.24.83/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://207.140.24.83/isales/wishlistRemoveToCart.htm"
+#define  URL_CART2WISH  @"https://erp.homelegance.com/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"https://erp.homelegance.com/isales/wishlistRemoveToCart.htm"
 
-#define  URL_ITEM_DETAIL  @"http://207.140.24.83/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"https://erp.homelegance.com/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://207.140.24.83/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://207.140.24.83/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://207.140.24.83/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"https://erp.homelegance.com/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"https://erp.homelegance.com/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"https://erp.homelegance.com/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://207.140.24.83/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://207.140.24.83/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIO  @"http://207.140.24.83/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://207.140.24.83/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://207.140.24.83/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://207.140.24.83/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://207.140.24.83/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://207.140.24.83/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://207.140.24.83/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://207.140.24.83/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://207.140.24.83/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"https://erp.homelegance.com/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"https://erp.homelegance.com/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIO  @"https://erp.homelegance.com/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"https://erp.homelegance.com/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"https://erp.homelegance.com/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"https://erp.homelegance.com/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"https://erp.homelegance.com/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"https://erp.homelegance.com/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"https://erp.homelegance.com/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"https://erp.homelegance.com/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"https://erp.homelegance.com/isales/getTearSheetAvailableQty.htm"
 
 
-#define  URL_CONTACT_LIST  @"http://207.140.24.83/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://207.140.24.83/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"https://erp.homelegance.com/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"https://erp.homelegance.com/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://207.140.24.83/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://207.140.24.83/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"https://erp.homelegance.com/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"https://erp.homelegance.com/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://207.140.24.83/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://207.140.24.83/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"https://erp.homelegance.com/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"https://erp.homelegance.com/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://207.140.24.83/isales/getCustomerInfoByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://207.140.24.83/isales/getAddCustomer.htm"
-#define  URL_CUSTOMER_SAVE  @"http://207.140.24.83/isales/saveCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://207.140.24.83/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"https://erp.homelegance.com/isales/getCustomerInfoByContact.htm"
+#define  URL_NEW_CUSTOMER  @"https://erp.homelegance.com/isales/getAddCustomer.htm"
+#define  URL_CUSTOMER_SAVE  @"https://erp.homelegance.com/isales/saveCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"https://erp.homelegance.com/isales/updateCustomerBusiCard.htm"
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://207.140.24.83/isales/er_log.htm"
+#define  URL_ERR_LOG  @"https://erp.homelegance.com/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://207.140.24.83/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"https://erp.homelegance.com/isales/uploadImg.htm"
 
-#define URL_COPY_ORDER @"http://207.140.24.83/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://207.140.24.83/isales/updateOrderSign.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://207.140.24.83/isales/updateCustomer.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://207.140.24.83/isales/updateGeneralNote.htm"
-#define  URL_CART_ITEM_NOTES  @"http://207.140.24.83/isales/setItemNotes.htm"
-#define  URL_EDIT_CUSTOMER  @"http://207.140.24.83/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://207.140.24.83/isales/hasPendingOrderByContact.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://207.140.24.83/isales/deleteTearSheetPdf.htm"
-#define  URL_NPD_POLICY   @"http://207.140.24.83/isales/generalPolicy.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://207.140.24.83/isales/getContactAdvance.htm"
+#define URL_COPY_ORDER @"https://erp.homelegance.com/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"https://erp.homelegance.com/isales/updateOrderSign.htm"
+#define  URL_CUSTOMER_UPDATE  @"https://erp.homelegance.com/isales/updateCustomer.htm"
+#define  URL_CART_GENERAL_NOTES  @"https://erp.homelegance.com/isales/updateGeneralNote.htm"
+#define  URL_CART_ITEM_NOTES  @"https://erp.homelegance.com/isales/setItemNotes.htm"
+#define  URL_EDIT_CUSTOMER  @"https://erp.homelegance.com/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"https://erp.homelegance.com/isales/hasPendingOrderByContact.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"https://erp.homelegance.com/isales/deleteTearSheetPdf.htm"
+#define  URL_NPD_POLICY   @"https://erp.homelegance.com/isales/generalPolicy.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"https://erp.homelegance.com/isales/getContactAdvance.htm"
 
 #define  URL_CHECK_OFFLINE  @"http://192.168.1.3/check.htm"