Ray Zhang před 10 měsíci
rodič
revize
aaed6c4bf3

+ 2 - 2
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 = 57132;
+				CURRENT_PROJECT_VERSION = 57133;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2524,7 +2524,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 = 57132;
+				CURRENT_PROJECT_VERSION = 57133;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -239,7 +239,7 @@
     if((![price1 isEqualToString: @"N/A"] && [price1 isEqualToString:price3])||(![price2 isEqualToString: @"N/A"] && [price2 isEqualToString:price3]))
     {
 //        if(RASingleton.sharedInstance.price_type==1)
-            _modelJson [@"net_price"] = @true;
+//            _modelJson [@"net_price"] = @true;
         // remove net price
         _modelJson [@"net_price"] = @false;
     }

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

@@ -115,7 +115,7 @@
     if((![price1 isEqualToString: @"N/A"] && [price1 isEqualToString:price3])||(![price2 isEqualToString: @"N/A"] && [price2 isEqualToString:price3]))
     {
 //        if(RASingleton.sharedInstance.price_type==1)
-            _modelJson [@"net_price"] = @true;
+ //           _modelJson [@"net_price"] = @true;
         
         // remove net price
         _modelJson [@"net_price"] = @false;

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

@@ -144,7 +144,7 @@
         {
             jitem [@"net_price"] = @true;
             // remove net price
-            jitem [@"net_price"] = @false;
+//            jitem [@"net_price"] = @false;
         }
         
         

+ 55 - 55
RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -1224,61 +1224,61 @@ void UncaughtExceptionHandler(NSException *exception) {
     return position;
 }
 
--(void)handle_download:(NSString *)url start:(bool) start type:(NSString*) type taskid:(int)taskidx
-{
-    //操作有两种,start stop;
-    //结果有四种, wait , downloading, pause, finish
-    
-    dispatch_async(dispatch_get_main_queue(), ^{
-        // debug;
-//        NSString* file_name=[url lastPathComponent];
-        //暂停<->开始转换
-        
-        //   bool isdownloading = [self isdownloading:file_name];
-        if (start)
-        {//开始下载
-            
-            
-            
-            
-            
-            
-            DebugLog(@"%d start",taskidx);
-            
-            self.current_task=taskidx;
-            
-            
-            
-            NSURL* _url = [NSURL URLWithString:url];//@"http://localhost/test.zip"];
-            
-            //        _url = [NSURL URLWithString:@"https://rate.apexshipping.com/temp/apache-tomcat-8.0.22.zip"];
-            //
-            //
-            //        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:_url];
-            //
-            //        //设置请求头(GET)
-            //        NSString *range = [NSString stringWithFormat:@"bytes=%lld-", [self getcurrentLength:taskidx]];
-            //        [request setValue:range forHTTPHeaderField:@"Range"];
-            //
-            //        self.connection = [NSURLConnection connectionWithRequest:request delegate:self];
-            
-            
-            NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:_url];
-            
-            //设置请求头(GET)
-            NSString *range = [NSString stringWithFormat:@"bytes=%lld-",  [self getcurrentLength:taskidx]];
-            [request setValue:range forHTTPHeaderField:@"Range"];
-            
-            
-            self.connection = [NSURLConnection connectionWithRequest:request delegate:self];
-            
-        }else{ //暂停
-            DebugLog(@"%d pause",taskidx);
-            [self.connection cancel];
-            self.connection = nil;
-        }
-    });
-}
+//-(void)handle_download:(NSString *)url start:(bool) start type:(NSString*) type taskid:(int)taskidx
+//{
+//    //操作有两种,start stop;
+//    //结果有四种, wait , downloading, pause, finish
+//    
+//    dispatch_async(dispatch_get_main_queue(), ^{
+//        // debug;
+////        NSString* file_name=[url lastPathComponent];
+//        //暂停<->开始转换
+//        
+//        //   bool isdownloading = [self isdownloading:file_name];
+//        if (start)
+//        {//开始下载
+//            
+//            
+//            
+//            
+//            
+//            
+//            DebugLog(@"%d start",taskidx);
+//            
+//            self.current_task=taskidx;
+//            
+//            
+//            
+//            NSURL* _url = [NSURL URLWithString:url];//@"http://localhost/test.zip"];
+//            
+//            //        _url = [NSURL URLWithString:@"https://rate.apexshipping.com/temp/apache-tomcat-8.0.22.zip"];
+//            //
+//            //
+//            //        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:_url];
+//            //
+//            //        //设置请求头(GET)
+//            //        NSString *range = [NSString stringWithFormat:@"bytes=%lld-", [self getcurrentLength:taskidx]];
+//            //        [request setValue:range forHTTPHeaderField:@"Range"];
+//            //
+//            //        self.connection = [NSURLConnection connectionWithRequest:request delegate:self];
+//            
+//            
+//            NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:_url];
+//            
+//            //设置请求头(GET)
+//            NSString *range = [NSString stringWithFormat:@"bytes=%lld-",  [self getcurrentLength:taskidx]];
+//            [request setValue:range forHTTPHeaderField:@"Range"];
+//            
+//            
+//            self.connection = [NSURLConnection connectionWithRequest:request delegate:self];
+//            
+//        }else{ //暂停
+//            DebugLog(@"%d pause",taskidx);
+//            [self.connection cancel];
+//            self.connection = nil;
+//        }
+//    });
+//}
 -(void) upload_offline:(NSString*) ver useInternalAddress:(bool)buseinternaladdress orderid:(NSArray*)arr_order params:(NSMutableDictionary*) add_params
 {
     

+ 5 - 5
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1005,7 +1005,7 @@
 - (IBAction)onUserButtonClick:(id)sender {
     
     DebugLog(@"header view login");
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     if( RASingleton.sharedInstance.user ==nil)
     {
         
@@ -3257,8 +3257,8 @@
     } else if ([title isEqualToString:@"Price Setting"]) {
         
 
-        UIApplication * app = [UIApplication sharedApplication];
-        AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+//        UIApplication * app = [UIApplication sharedApplication];
+//        AppDelegate *appDelegate = (AppDelegate *)[app delegate];
         
         if ([RASingleton sharedInstance].global_lock) {
             
@@ -3300,8 +3300,8 @@
         
     } else if ([title isEqualToString:@"Lock"] || [title isEqualToString:@"Unlock"]) {
         
-        UIApplication * app = [UIApplication sharedApplication];
-        AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+//        UIApplication * app = [UIApplication sharedApplication];
+//        AppDelegate *appDelegate = (AppDelegate *)[app delegate];
         
         JKLockController *lockVC = [[JKLockController alloc] init];
         [lockVC setPasswordKey:[NSString stringWithFormat:@"%@_password",RASingleton.sharedInstance.user]];

+ 1 - 1
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -2485,7 +2485,7 @@
     if((![price1 isEqualToString: @"N/A"] && [price1 isEqual:price3])||(![price2 isEqualToString: @"N/A"] && [price2 isEqual:price3]))
     {
 //        if(RASingleton.sharedInstance.price_type==1)
-            _modelJson [@"net_price"] = @true;
+//            _modelJson [@"net_price"] = @true;
         
         // remove net price
         _modelJson [@"net_price"] = @false;

+ 1 - 1
RedAnt ERP Mobile/common/Functions/offline/OfflineSettingViewController.m

@@ -31,7 +31,7 @@
     
     
     UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Unlock" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
-        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
 
         sqlite3* db = [iSalesDB get_db];
         int offline_user_iscurrent=[iSalesDB get_recordcount:db table:@"offline_login" where:[NSString stringWithFormat:@"username='%@'",RASingleton.sharedInstance.user ]];

+ 1 - 1
RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -774,7 +774,7 @@
         NSData *imageData = UIImagePNGRepresentation(img);
         NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
         
-        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
         if(RASingleton.sharedInstance.user!=nil)
             [params setValue:RASingleton.sharedInstance.user forKey:@"user"];
         if(RASingleton.sharedInstance.password!=nil)

+ 1 - 1
RedAnt ERP Mobile/common/Functions/portfolio/PortfolioListViewController.m

@@ -700,7 +700,7 @@
     
     
     NSString* create_user= [self.content_data[indexPath.row] valueForKey:@"create_user"];
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     if([create_user isEqualToString:RASingleton.sharedInstance.user])
     {
 //         return @[deleteRowAction];

+ 4 - 3
RedAnt ERP Mobile/common/Functions/sidemenu/ScannerSettingViewController.m

@@ -348,11 +348,12 @@
 {
     NSString* CellIdentifier = @"device_cell";
     UITableViewCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
-    UIApplication * app = [UIApplication sharedApplication];
-    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
     
-#ifdef USE_MFI_SCANNER
     
+    
+#ifdef USE_MFI_SCANNER
+    UIApplication * app = [UIApplication sharedApplication];
+    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
     DeviceInfo* info = appDelegate.devices[indexPath.row];
     cell.textLabel.text = [info getName];
     cell.detailTextLabel.text = info.getTypeString;

+ 2 - 2
RedAnt ERP Mobile/common/JKLock/JKLockController.m

@@ -307,7 +307,7 @@
     
     messageBoxController.textHandler = ^(NSString *text){
         
-        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+//        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
         
         if ([text isEqualToString:RASingleton.sharedInstance.password]) {
             
@@ -373,7 +373,7 @@
     
     messageBoxController.textHandler = ^(NSString *text){
         
-        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+//        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
         
         if ([text isEqualToString:RASingleton.sharedInstance.password]) {
             

+ 4 - 1
RedAnt ERP Mobile/common/photoStack/PhotoStackView.m

@@ -314,7 +314,10 @@ static CGFloat const PhotoRotationOffsetDefault = 4.0f;
 
 -(void)sendActionsForControlEvents:(UIControlEvents)controlEvents {
     [super sendActionsForControlEvents:controlEvents];
-    self.highlighted = (controlEvents == UIControlStateHighlighted) ? YES : NO;
+    
+    
+//    self.highlighted = (controlEvents == UIControlStateHighlighted) ? YES : NO;
+    self.highlighted = (controlEvents == UIControlEventTouchDown) ? YES : NO;
 }
 
 

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

@@ -2338,7 +2338,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 2.00;
+				MARKETING_VERSION = 2.01;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2387,7 +2387,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 2.00;
+				MARKETING_VERSION = 2.01;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

+ 87 - 87
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -18,7 +18,7 @@
 #define USE_MFI_SCANNER // stock mobile mfi 扫描枪
 
 # ifdef DEBUG
-//#define test_server
+#define test_server
 # endif
 
 #define exception_switch 1
@@ -50,147 +50,147 @@
 #define LOCAL_URL_CUSTOMER_INFO_EDITOR @"customer_info_template"
 #define LOCAL_URL_CUSTOMER_INFO_EDIT @"customer_info_template_edit"
 
-// http://192.168.0.112:8080/site
+// http://192.168.2.179:8080/site
 // http://12.196.120.217
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_BACK_ORDER_PREVIEW  @"http://192.168.0.112/pjHmlg/isales/cartDeliveryBackOrderReview.htm"
-#define  URL_MOVE_TO_BACK_ORDER @"http://192.168.0.112/pjHmlg/isales/moveToBackOrder.htm"
+#define  URL_BACK_ORDER_PREVIEW  @"http://192.168.2.179/pjHmlg/isales/cartDeliveryBackOrderReview.htm"
+#define  URL_MOVE_TO_BACK_ORDER @"http://192.168.2.179/pjHmlg/isales/moveToBackOrder.htm"
 #define URL_ORDER_DISCOUNT @""
-#define  URL_UPDATE_AUTH  @"http://192.168.0.112/pjHmlg/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.112/pjHmlg/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.112/pjHmlg/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.2.179/pjHmlg/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.2.179/pjHmlg/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.2.179/pjHmlg/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.112/pjHmlg/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.112/pjHmlg/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.112/pjHmlg/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.112/pjHmlg/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.112/pjHmlg/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.112/pjHmlg/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.112/pjHmlg/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.2.179/pjHmlg/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.2.179/pjHmlg/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.2.179/pjHmlg/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.2.179/pjHmlg/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.2.179/pjHmlg/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.2.179/pjHmlg/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.2.179/pjHmlg/isales/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.112/pjHmlg/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.112/pjHmlg/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.112/pjHmlg/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.112/pjHmlg/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.112/pjHmlg/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.112/pjHmlg/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.112/pjHmlg/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.112/pjHmlg/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.112/pjHmlg/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.112/pjHmlg/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.112/pjHmlg/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.112/pjHmlg/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.2.179/pjHmlg/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.2.179/pjHmlg/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.2.179/pjHmlg/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.2.179/pjHmlg/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.2.179/pjHmlg/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.2.179/pjHmlg/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.2.179/pjHmlg/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.2.179/pjHmlg/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.2.179/pjHmlg/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.2.179/pjHmlg/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.2.179/pjHmlg/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.2.179/pjHmlg/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.112/pjHmlg/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.112/pjHmlg/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.112/pjHmlg/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.2.179/pjHmlg/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.2.179/pjHmlg/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.2.179/pjHmlg/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.112/pjHmlg/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.112/pjHmlg/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.112/pjHmlg/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.112/pjHmlg/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.112/pjHmlg/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.112/pjHmlg/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.112/pjHmlg/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.112/pjHmlg/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.2.179/pjHmlg/isales/increment.htm"
+#define  URL_CART  @"http://192.168.2.179/pjHmlg/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.2.179/pjHmlg/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.2.179/pjHmlg/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.2.179/pjHmlg/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.2.179/pjHmlg/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.2.179/pjHmlg/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.2.179/pjHmlg/isales/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_CATEGORYADDALL  @"http://192.168.0.112/pjHmlg/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"http://192.168.0.112/pjHmlg/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"http://192.168.0.112/pjHmlg/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"http://192.168.2.179/pjHmlg/isales/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"http://192.168.2.179/pjHmlg/isales/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"http://192.168.2.179/pjHmlg/isales/itemSearchAddAllTo.htm"
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.112/pjHmlg/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.2.179/pjHmlg/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.112/pjHmlg/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.112/pjHmlg/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.112/pjHmlg/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.2.179/pjHmlg/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.2.179/pjHmlg/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.2.179/pjHmlg/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.112/pjHmlg/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.112/pjHmlg/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.112/pjHmlg/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.112/pjHmlg/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.112/pjHmlg/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.112/pjHmlg/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.112/pjHmlg/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.112/pjHmlg/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.112/pjHmlg/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.112/pjHmlg/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.112/pjHmlg/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.112/pjHmlg/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.2.179/pjHmlg/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.2.179/pjHmlg/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.2.179/pjHmlg/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.2.179/pjHmlg/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.2.179/pjHmlg/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.2.179/pjHmlg/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.2.179/pjHmlg/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.2.179/pjHmlg/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.2.179/pjHmlg/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.2.179/pjHmlg/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.2.179/pjHmlg/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.2.179/pjHmlg/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.112/pjHmlg/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.112/pjHmlg/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.2.179/pjHmlg/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.2.179/pjHmlg/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.112/pjHmlg/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.112/pjHmlg/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.2.179/pjHmlg/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.2.179/pjHmlg/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.112/pjHmlg/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.112/pjHmlg/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.2.179/pjHmlg/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.2.179/pjHmlg/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.112/pjHmlg/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.112/pjHmlg/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.112/pjHmlg/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.112/pjHmlg/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.112/pjHmlg/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.112/pjHmlg/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.112/pjHmlg/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.2.179/pjHmlg/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.2.179/pjHmlg/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.2.179/pjHmlg/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.2.179/pjHmlg/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.2.179/pjHmlg/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.2.179/pjHmlg/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.2.179/pjHmlg/isales/updateCustomerBusiCard.htm"
 
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.112/pjHmlg/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.2.179/pjHmlg/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.112/pjHmlg/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.2.179/pjHmlg/isales/uploadImg.htm"
 
 
-#define  URL_NPD_POLICY  @"http://192.168.0.112/pjHmlg/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.2.179/pjHmlg/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.112:8080/site/offline/initDatas.htm"
-#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.112:8080/site/offline/uploadOfflineData.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.2.179:8080/site/offline/initDatas.htm"
+#define  URL_UPLOAD_OFFLINE  @"http://192.168.2.179:8080/site/offline/uploadOfflineData.htm"
 
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.112:8080/site/offline/downloadDatas.htm"
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.112:8080/site/offline/confirmVersion.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.2.179:8080/site/offline/downloadDatas.htm"
+#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.2.179:8080/site/offline/confirmVersion.htm"
 
 
-#define  URL_GET_RESULT  @"http://192.168.0.112:8080/site/offline/getResultBySerial.htm"
+#define  URL_GET_RESULT  @"http://192.168.2.179:8080/site/offline/getResultBySerial.htm"
 
-#define URL_SET_PRICE_TYPE @"http://192.168.0.112/pjHmlg/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"http://192.168.2.179/pjHmlg/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"http://192.168.0.112/pjHmlg/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"http://192.168.2.179/pjHmlg/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"http://192.168.0.112/pjHmlg/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"http://192.168.2.179/pjHmlg/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"http://192.168.0.112/pjHmlg/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"http://192.168.2.179/pjHmlg/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"http://192.168.0.112/pjHmlg/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"http://192.168.2.179/pjHmlg/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"http://192.168.0.112/pjHmlg/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"http://192.168.2.179/pjHmlg/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"http://192.168.0.112/pjHmlg/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"http://192.168.2.179/pjHmlg/isales/notifyMeEmail.htm"
 
-#define URL_EMAIL_WISHLIST @"http://192.168.0.112/pjHmlg/isales/sendWishListEmail.htm"
+#define URL_EMAIL_WISHLIST @"http://192.168.2.179/pjHmlg/isales/sendWishListEmail.htm"
 
-#define URL_BLOG @"http://192.168.0.112:8080/site/blog"
+#define URL_BLOG @"http://192.168.2.179:8080/site/blog"
 
 #define URL_PRIVACY @""
 
-#define  URL_DELETE_ACCOUNT  @"http://192.168.0.112/pjHmlg/isales/cancelAccount.htm"
+#define  URL_DELETE_ACCOUNT  @"http://192.168.2.179/pjHmlg/isales/cancelAccount.htm"
 #define URL_CHANGE_PASSWORD @""
 #define URL_SIGN_UP @""
 #else