160802 identify simulator and device

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1466,11 +1466,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "491377663.411976"
+            timestampString = "491736080.517208"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1266"
-            endingLineNumber = "1266"
+            startingLineNumber = "1272"
+            endingLineNumber = "1272"
             landmarkName = "+request_OrderList:limit:keywords:status:customer:"
             landmarkType = "5">
          </BreakpointContent>
@@ -1482,11 +1482,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "491377663.411976"
+            timestampString = "491736080.517208"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1291"
-            endingLineNumber = "1291"
+            startingLineNumber = "1297"
+            endingLineNumber = "1297"
             landmarkName = "+request_OrderList:limit:keywords:status:customer:"
             landmarkType = "5">
          </BreakpointContent>
@@ -1514,11 +1514,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "491377663.411976"
+            timestampString = "491736080.517208"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "221"
-            endingLineNumber = "221"
+            startingLineNumber = "227"
+            endingLineNumber = "227"
             landmarkName = "+get_json:parameters:"
             landmarkType = "5">
          </BreakpointContent>
@@ -1530,11 +1530,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "491377652.944005"
+            timestampString = "491736080.517208"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "299"
-            endingLineNumber = "299"
+            startingLineNumber = "305"
+            endingLineNumber = "305"
             landmarkName = "+get_json:parameters:"
             landmarkType = "5">
          </BreakpointContent>
@@ -1546,11 +1546,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "491377763.552532"
+            timestampString = "491736080.517208"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2830"
-            endingLineNumber = "2830"
+            startingLineNumber = "2836"
+            endingLineNumber = "2836"
             landmarkName = "+parse_authinfo:user:password:"
             landmarkType = "5">
          </BreakpointContent>

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -116,7 +116,13 @@
     [params setValue:appDelegate.build forKey:@"app_ver"];
     UIDevice * dev = [UIDevice currentDevice];
     NSUUID* uuid =dev.identifierForVendor;
+#if TARGET_IPHONE_SIMULATOR//模拟器
+    [params setValue:@"simulater_uuid" forKey:@"idfv"];
+#elif TARGET_OS_IPHONE//真机
     [params setValue:uuid.UUIDString forKey:@"idfv"];
+#endif
+    
+    
     
 repeat:
     {

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -10,6 +10,9 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 
+//#define debug_build 
+
+
 #define CONTACT_LIST 1
 
 #define  APP_NAME @"NPD Mobile"
@@ -20,108 +23,110 @@
 #define LOCAL_URL_CUSTOMER_INFO_EDIT @"customer_info_template_edit"
 
 
-//
-////------------------- chen server-----------------------
-//#define  URL_UPDATE_AUTH  @"http://192.168.0.111:8080/site/isales/login.htm"
-//#define  URL_LOGOUT  @"http://192.168.0.111:8080/site/isales/loginOut.htm"
-//#define  URL_RETRIEVE_PASS  @"http://192.168.0.111:8080/site/isales/forgotPassword.htm"
-//
-//#define  URL_REQUEST_CATMENU  @"http://192.168.0.111:8080/site/isales/menu.htm"
-//#define  URL_LOAD_HOME  @"http://192.168.0.111:8080/site/isales/homePage.htm"
-//#define  URL_CATEGORY @"http://192.168.0.111:8080/site/isales/distinctCategory.htm"
-//#define  URL_SEARCH  @"http://192.168.0.111:8080/site/isales/search.htm"
-//#define  URL_ITEM_SEARCH  @"http://192.168.0.111:8080/site/isales/itemSearch.htm"
-//#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.111:8080/site/isales/categoryMore.htm"
-//#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.111:8080/site/isales/getContactAdvance.htm"
-//
-//
-//#define  URL_ORDER_LIST  @"http://192.168.0.111:8080/site/isales/orderList.htm"
-//#define  URL_ORDER_DETAIL  @"http://192.168.0.111:8080/site/isales/orderDetail.htm"
-//#define URL_COMMIT_ORDER @"http://192.168.0.111:8080/site/isales/createOrder.htm"
-//#define URL_COPY_ORDER @"http://192.168.0.111:8080/site/isales/copyOrder.htm"
-//#define URL_SIGN_ORDER @"http://192.168.0.111:8080/site/isales/updateOrderSign.htm"
-//#define URL_SAVE_ORDER @"http://192.168.0.111:8080/site/isales/saveOrder.htm"
-//#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.111:8080/site/isales/updateOrderCustomerInfo.htm"
-//#define  URL_NEW_ORDER  @"http://192.168.0.111:8080/site/isales/createNewOrder.htm"
-//#define  URL_OPEN_ORDER  @"http://192.168.0.111:8080/site/isales/openOrder.htm"
-//#define  URL_RELEASE_ORDER  @"http://192.168.0.111:8080/site/isales/closeOrder.htm"
-//#define  URL_DELETE_ORDER  @"http://192.168.0.111:8080/site/isales/deleteOrder.htm"
-//#define  URL_CANCEL_ORDER  @"http://192.168.0.111:8080/site/isales/cancelOrder.htm"
-//
-//
-//#define  URL_CART_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setPrice.htm"
-//#define  URL_CART_ITEM_NOTES  @"http://192.168.0.111:8080/site/isales/setItemNotes.htm"
-//#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.111:8080/site/isales/updateGeneralNote.htm"
-//
-//#define  URL_CART_INCRESEMENT  @"http://192.168.0.111:8080/site/isales/increment.htm"
-//#define  URL_CART  @"http://192.168.0.111:8080/site/isales/cartDtail.htm"
-//#define  URL_CARTDELIVERY  @"http://192.168.0.111:8080/site/isales/cartDelivery.htm"
-//#define  URL_ADD_TO_CART  @"http://192.168.0.111:8080/site/isales/addToCart.htm"
-//#define  URL_CART_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToCart.htm"
-//#define  URL_CART_CHECK  @"http://192.168.0.111:8080/site/isales/checkCartItem.htm"
-//#define  URL_CART2WISH  @"http://192.168.0.111:8080/site/isales/cartRemoveToWishlist.htm"
-//#define  URL_WISH2CART  @"http://192.168.0.111:8080/site/isales/wishlistRemoveToCart.htm"
-//
-//
-//
-//
-//#define  URL_ITEM_DETAIL  @"http://192.168.0.111:8080/site/isales/modelDetail.htm"
-//
-//#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.111:8080/site/isales/addToWishList.htm"
-//#define  URL_WATCHLIST  @"http://192.168.0.111:8080/site/isales/wishList.htm"
-//#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToWishList.htm"
-//
-//
-//
-//#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.111:8080/site/isales/addToPortfolio.htm"
-//#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToPortfolio.htm"
-//#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteTearSheetPdf.htm"
-//#define  URL_PORTFOLIO  @"http://192.168.0.111:8080/site/isales/portfolios.htm"
-//#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setTearSheetPrice.htm"
-//#define  URL_DM_PARAMS @"http://192.168.0.111:8080/site/isales/selectTearSheetParam.htm"
-//#define  URL_REQUEST_DM @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
-//#define  URL_SAVE_DM_DIRECT @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
-//#define  URL_SAVE_DM @"http://192.168.0.111:8080/site/isales/saveTearSheetPdf.htm"
-//#define  URL_DM_LIST @"http://192.168.0.111:8080/site/isales/tearSheetPdfList.htm"
-////#define  URL_DM_SET_QTY @"http://192.168.0.111:8080/site/isales/setTearSheetAvailableQty.htm"
-//#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.111:8080/site/isales/getTearSheetAvailableQty.htm"
-//
-//#define  URL_CONTACT_LIST  @"http://192.168.0.111:8080/site/isales/getAllContact.htm"
-//#define  URL_SHIPTO_LIST  @"http://192.168.0.111:8080/site/isales/getShipToContact.htm"
-//
-//#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.111:8080/site/isales/getAddAddress.htm"
-//#define  URL_ADDRESS_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
-//
-//
-//#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.111:8080/site/isales/creditCard.htm"
-//#define  URL_CREDITCARD_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
-//
-//
-//
-//#define  URL_CUSTOMER_INFO  @"http://192.168.0.111:8080/site/isales/getCustomerInfoByContact.htm"
-//#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.111:8080/site/isales/hasPendingOrderByContact.htm"
-//#define  URL_NEW_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getAddCustomer.htm"
-//#define  URL_EDIT_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-//#define  URL_CUSTOMER_SAVE  @"http://192.168.0.111:8080/site/isales/saveCustomer.htm"
-//#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.111:8080/site/isales/updateCustomer.htm"
-//#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.111:8080/site/isales/updateCustomerBusiCard.htm"
-//
-//
-//
-//
-//
-//
-//#define  URL_ERR_LOG  @"http://192.168.0.111:8080/site/isales/er_log.htm"
-//
-//#define  URL_UPLOAD_IMG  @"http://192.168.0.111:8080/site/isales/uploadImg.htm"
-//
-//#define  URL_NPD_POLICY  @"http://192.168.0.111:8080/site/isales/generalPolicy.htm"
-//
-//
-//#define  URL_CHECK_OFFLINE  @"http://192.168.0.111:8080/site/offline/initDatas.htm"
-//
-//#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.111:8080/site/offline/downloadDatas.htm"
+#ifdef debug_build
 
+//------------------- chen server-----------------------
+#define  URL_UPDATE_AUTH  @"http://192.168.0.111:8080/site/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.111:8080/site/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.111:8080/site/isales/forgotPassword.htm"
+
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.111:8080/site/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.111:8080/site/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.111:8080/site/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.111:8080/site/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.111:8080/site/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.111:8080/site/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.111:8080/site/isales/getContactAdvance.htm"
+
+
+#define  URL_ORDER_LIST  @"http://192.168.0.111:8080/site/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.111:8080/site/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.111:8080/site/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.111:8080/site/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.111:8080/site/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.111:8080/site/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.111:8080/site/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.111:8080/site/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.111:8080/site/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.111:8080/site/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.111:8080/site/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.111:8080/site/isales/cancelOrder.htm"
+
+
+#define  URL_CART_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.111:8080/site/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.111:8080/site/isales/updateGeneralNote.htm"
+
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.111:8080/site/isales/increment.htm"
+#define  URL_CART  @"http://192.168.0.111:8080/site/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.111:8080/site/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.111:8080/site/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.111:8080/site/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.111:8080/site/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.111:8080/site/isales/wishlistRemoveToCart.htm"
+
+
+
+
+#define  URL_ITEM_DETAIL  @"http://192.168.0.111:8080/site/isales/modelDetail.htm"
+
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.111:8080/site/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.111:8080/site/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToWishList.htm"
+
+
+
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.111:8080/site/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.111:8080/site/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.111:8080/site/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.111:8080/site/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.111:8080/site/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.111:8080/site/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.111:8080/site/isales/getTearSheetAvailableQty.htm"
+
+#define  URL_CONTACT_LIST  @"http://192.168.0.111:8080/site/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.111:8080/site/isales/getShipToContact.htm"
+
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.111:8080/site/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
+
+
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.111:8080/site/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
+
+
+
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.111:8080/site/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.111:8080/site/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.111:8080/site/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.111:8080/site/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.111:8080/site/isales/updateCustomerBusiCard.htm"
+
+
+
+
+
+
+#define  URL_ERR_LOG  @"http://192.168.0.111:8080/site/isales/er_log.htm"
+
+#define  URL_UPLOAD_IMG  @"http://192.168.0.111:8080/site/isales/uploadImg.htm"
+
+#define  URL_NPD_POLICY  @"http://192.168.0.111:8080/site/isales/generalPolicy.htm"
+
+
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.111:8080/site/offline/initDatas.htm"
+
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.111:8080/site/offline/downloadDatas.htm"
+
+#else
 
 
 //------------------- NPD server-----------------------
@@ -224,6 +229,8 @@
 
 #define  URL_DOWNLOAD_OFFLINE  @"https://www.newpacificdirect.com/offline/downloadDatas.htm"
 
+#endif
+
 #endif
 /*