Fix image cache function duplicate in both isalesdb and filecache class

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 = 54632;
+				CURRENT_PROJECT_VERSION = 54628;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -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 = 54632;
+				CURRENT_PROJECT_VERSION = 54628;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>HMLG Scan Order.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/HMLG Scan Order/CartViewController.m

@@ -3255,7 +3255,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                        [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/HMLG Scan Order/ServerSettingViewController.m

@@ -403,7 +403,7 @@
 //                            }
 //                            
 //                            
-//        //                    [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+//        //                    [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
 //        //
 //        //                    UIImage * img =[UIImage imageWithData:downloadimg_data];
 //        //                    cell.imageView.image=img;

RedAnt ERP Mobile/HMLG Scan Order/config.h

@@ -17,7 +17,7 @@
 #define RA_NOTIFICATION
 
 # ifdef DEBUG
-//#define test_server
+#define test_server
 # endif
 
 #define exception_switch 1

RedAnt ERP Mobile/common/AutoScrollImage/SliderPage.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "iSalesDB.h"
+
 @interface SliderPage : UIImageView
 @property (strong,nonatomic) NSString* url;
 @property (strong,nonatomic) NSString* img_url;

RedAnt ERP Mobile/common/AutoScrollImage/SliderPage.m

@@ -7,7 +7,7 @@
 //
 
 #import "SliderPage.h"
-
+#import "FileCache.h"
 @implementation SliderPage
 
 - (id)initWithFrame:(CGRect)frame
@@ -23,7 +23,7 @@
     if(self.image==nil)
     {
         NSString* file_name=[self.img_url lastPathComponent];
-        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:self.img_url];
+        NSData* img_data=[FileCache load_cached_img:file_name loadFrom:self.img_url];
         if(img_data!=nil)
         {
             
@@ -44,7 +44,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:self.img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:self.img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         self.image = img;

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -56,6 +56,9 @@
 
 
 #import "CustomerEditViewController.h"
+
+
+#import "FileCache.h"
 //#define ALERT_FREE 1024
 //#define ALERT_DEL 1025
 //#define ALERT_SET_FREE 1026
@@ -3498,7 +3501,7 @@
         [cell.btnImage setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
         
         NSString* file_name=[img_url lastPathComponent];
-        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
         if(img_data!=nil)
         {
             
@@ -3520,7 +3523,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                        [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -34,6 +34,8 @@
 #import "UIColor+JK_HEX.h"
 #import "CartUtils.h"
 
+#import "FileCache.h"
+
 #define  DEF_CELL_HEIGHT 44
 #define  DEF_TABLE_HEIGHT 44
 #define  LINE_WIDTH 0
@@ -2142,7 +2144,7 @@
     if (![cell.imageName isEqualToString:img_url]) {
         cell.imageName = img_url;
         cell.cellImageView.image = [UIImage imageNamed:loading];
-        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
         if(img_data!=nil)
         {
             
@@ -2173,7 +2175,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         cell.cellImageView.image = img;

RedAnt ERP Mobile/common/Functions/home/HomeTableViewCellTopic.m

@@ -8,9 +8,9 @@
 
 #import "HomeTableViewCellTopic.h"
 #import "CategoryCellSmall.h"
-#import "iSalesDB.h"
-#import "DetailViewController.h"
 
+#import "DetailViewController.h"
+#import "FileCache.h"
 @implementation HomeTableViewCellTopic
 @synthesize itemdelegate;
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
@@ -60,7 +60,7 @@
     //        cell.Price.text = price;
     cell.cellImageView.image = [UIImage imageNamed:@"loading_s"];
     NSString* file_name=[img_url lastPathComponent];
-    NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+    NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
     if(img_data!=nil)
     {
         
@@ -81,7 +81,7 @@
                 if(downloadimg_data!=nil)
                 {
                     
-                    [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                    [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                     
                     UIImage * img =[UIImage imageWithData:downloadimg_data];
                     cell.cellImageView.image = img;

RedAnt ERP Mobile/common/Functions/home/HomeViewController.m

@@ -17,6 +17,8 @@
 #import "ImageUtils.h"
 #import "HomeTableViewCellSlide.h"
 
+#import "FileCache.h"
+
 //#import "MainViewController.h"
 
 @interface HomeViewController ()
@@ -583,7 +585,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         bannercell.BannerImageView.image = img;
@@ -669,7 +671,7 @@
                         if(downloadimg_data!=nil)
                         {
                             
-                            [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                            [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                             
                             UIImage * img =[UIImage imageWithData:downloadimg_data];
                             [btn_item setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/common/Functions/modelDetail/DetailTopicCell.m

@@ -8,11 +8,11 @@
 
 #import "DetailTopicCell.h"
 #import "CategoryCellSmall.h"
-#import "iSalesDB.h"
+
 #import "DetailViewController.h"
 #import "DefaultAppearance.h"
 #import "AppDelegate.h"
-
+#import "FileCache.h"
 
 @implementation DetailTopicCell
 @synthesize itemdelegate;
@@ -101,7 +101,7 @@
     cell.cellImageView.image = [UIImage imageNamed:loading];
     
     NSString* file_name=[img_url lastPathComponent];
-    NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+    NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
     if(img_data!=nil)
     {
         
@@ -132,7 +132,7 @@
                 if(downloadimg_data!=nil)
                 {
                     
-                    [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                    [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                     
                     UIImage * img =[UIImage imageWithData:downloadimg_data];
                     cell.cellImageView.image = img;
@@ -179,7 +179,7 @@
 //                    if(downloadimg_data!=nil)
 //                    {
 //
-//                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+//                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
 //
 //                        UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                        cell.cellImageView.image = img;

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -31,6 +31,8 @@
 #import "ModelDescriptionController.h"
 #import "TextUtils.h"
 
+#import "FileCache.h"
+
 
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)
 #import "HomerModelDetailHeaderCell.h"
@@ -1700,7 +1702,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
                     
                     
                     NSString* file_name=[img_url lastPathComponent];
-                    NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+                    NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
                     if(img_data!=nil)
                     {
                         dispatch_async(dispatch_get_main_queue(), ^{
@@ -1728,7 +1730,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
                             if(downloadimg_data!=nil)
                             {
                                 
-                                [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                                [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
                                 cell.selector_imageView.image=img;
@@ -1809,7 +1811,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
                         if([item_json[@"is_localfile"] boolValue])
                             img_data = [NSData dataWithContentsOfFile:img_url];
                         else
-                            img_data = [iSalesDB load_cached_img:file_name loadFrom:img_url];
+                            img_data = [FileCache load_cached_img:file_name loadFrom:img_url];
                     }
                     
                     if(img_data!=nil)
@@ -1847,7 +1849,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
                             if(downloadimg_data!=nil)
                             {
                                 
-                                [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                                [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
                                 [cell AddPhoto:img];
@@ -2113,7 +2115,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
                 NSString* img_url = [img_json valueForKey:@"img_url"];
                 posy+=height*tableView.bounds.size.width / width;
                 NSString* file_name=[img_url lastPathComponent];
-                NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+                NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
                 if(img_data!=nil)
                 {
                     
@@ -2141,7 +2143,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
                             if(downloadimg_data!=nil)
                             {
                                 
-                                [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                                [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
                                 imgview.image = img;

RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -28,6 +28,8 @@
 #import "OLDataProvider.h"
 #import "OrderDetailPickInfoCell.h"
 
+#import "FileCache.h"
+
 #define  DEF_CELL_HEIGHT 44
 #define  DEF_TABLE_HEIGHT 44
 #define  LINE_WIDTH 0
@@ -2033,7 +2035,7 @@
         
         
         NSString* file_name=[img_url lastPathComponent];
-        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
         if(img_data!=nil)
         {
             
@@ -2054,7 +2056,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         cell.sign_img.image=img ;
@@ -2261,7 +2263,7 @@
                 [cell.imgbtn setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
                 
                 NSString* file_name=[img_url lastPathComponent];
-                NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+                NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
                 if(img_data!=nil)
                 {
                     
@@ -2283,7 +2285,7 @@
                             if(downloadimg_data!=nil)
                             {
                                 
-                                [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                                [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
@@ -2449,7 +2451,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         cell.sign_img.image=img ;
@@ -2679,7 +2681,7 @@
                             if(downloadimg_data!=nil)
                             {
                                 
-                                [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                                [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
@@ -2851,7 +2853,7 @@
                             if(downloadimg_data!=nil)
                             {
                                 
-                                [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                                [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
                                 cell.sign_img.image=img ;
@@ -3068,7 +3070,7 @@
                             if(downloadimg_data!=nil)
                             {
                                 
-                                [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                                [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                                 
                                 UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                                [cell.imgbtn setBackgroundImage:img forState:UIControlStateNormal];
@@ -3251,7 +3253,7 @@
     //
     //                if(downloadimg_data!=nil)
     //                {
-    //                    [iSalesDB cache_img:downloadimg_data :file_name ];
+    //                    [FileCache cache_img:downloadimg_data :file_name ];
     //
     //                    UIImage * img =[UIImage imageWithData:downloadimg_data];
     //                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1144,7 +1144,7 @@
     //
     //                if(downloadimg_data!=nil)
     //                {
-    //                    [iSalesDB cache_img:downloadimg_data :file_name ];
+    //                    [FileCache cache_img:downloadimg_data :file_name ];
     //
     //                    UIImage * img =[UIImage imageWithData:downloadimg_data];
     //                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioListViewController.m

@@ -459,7 +459,7 @@
     //
     //                if(downloadimg_data!=nil)
     //                {
-    //                    [iSalesDB cache_img:downloadimg_data :file_name ];
+    //                    [FileCache cache_img:downloadimg_data :file_name ];
     //
     //                    UIImage * img =[UIImage imageWithData:downloadimg_data];
     //                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -25,6 +25,8 @@
 #import "SortButton.h"
 #import "TextUtils.h"
 
+#import "FileCache.h"
+
 #ifdef BUILD_UWAVER
 
 //#import "RAPortfolioInputDialog.h"
@@ -1338,7 +1340,7 @@
     [cell.btnImage setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
     
     NSString* file_name=[img_url lastPathComponent];
-    NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+    NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
     if(img_data!=nil)
     {
         
@@ -1361,7 +1363,7 @@
                 if(downloadimg_data!=nil)
                 {
                     
-                    [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                    [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                     
                     UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m

@@ -20,6 +20,7 @@
 #import "UIColor+JK_HEX.h"
 #import "CartUtils.h"
 #import "RAConvertor.h"
+#import "FileCache.h"
 
 #define  DEF_CELL_HEIGHT 44
 #define  DEF_TABLE_HEIGHT 44
@@ -1922,7 +1923,7 @@
     if (![cell.imageName isEqualToString:img_url]) {
         cell.imageName = img_url;
         cell.cellImageView.image = [UIImage imageNamed:loading];
-        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
         if(img_data!=nil)
         {
             
@@ -1943,7 +1944,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         cell.cellImageView.image = img;

RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m

@@ -18,6 +18,8 @@
 #import "UIColor+JK_HEX.h"
 #import "CartUtils.h"
 
+#import "FileCache.h"
+
 #define  DEF_CELL_HEIGHT 44
 #define  DEF_TABLE_HEIGHT 44
 #define  LINE_WIDTH 0
@@ -1930,7 +1932,7 @@
     if (![cell.imageName isEqualToString:img_url]) {
         cell.imageName = img_url;
         cell.cellImageView.image = [UIImage imageNamed:loading];
-        NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+        NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
         if(img_data!=nil)
         {
             
@@ -1951,7 +1953,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         cell.cellImageView.image = img;

RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -24,6 +24,7 @@
 #import "CartUtils.h"
 #import "RAPDFViewController.h"
 #import "JKMessageBoxController.h"
+#import "FileCache.h"
 
 //#define ALERT_DEL 1025
 //#import "PDFViewController.h"
@@ -661,7 +662,7 @@
     [cell.btnImage setImage:[UIImage imageNamed:@"loading_s"] forState:UIControlStateNormal];
     
     NSString* file_name=[img_url lastPathComponent];
-    NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+    NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
     if(img_data!=nil)
     {
         
@@ -683,7 +684,7 @@
                 if(downloadimg_data!=nil)
                 {
                     
-                    [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                    [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                     
                     UIImage * img =[UIImage imageWithData:downloadimg_data];
 //                    [cell.btnImage setBackgroundImage:img forState:UIControlStateNormal];

RedAnt ERP Mobile/common/customUI/ImageScrollerView.m

@@ -7,7 +7,9 @@
 //
 
 #import "ImageScrollerView.h"
-#import "iSalesDB.h"
+
+
+#import "FileCache.h"
 #pragma mark -定义宏常量
 #define kImgViewCount 3
 
@@ -60,7 +62,7 @@
         {
             NSString* img_url = imgURL[i];
             NSString* file_name=[img_url lastPathComponent];
-            NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+            NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
             if(img_data!=nil)
             {
                 dispatch_async(dispatch_get_main_queue(), ^{
@@ -86,7 +88,7 @@
                     if(downloadimg_data!=nil)
                     {
                         
-                        [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                        [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                         
                         UIImage * img =[UIImage imageWithData:downloadimg_data];
                         [data addObject:img];

RedAnt ERP Mobile/common/customUI/NIDropDown.m

@@ -8,7 +8,9 @@
 
 #import "NIDropDown.h"
 #import "QuartzCore/QuartzCore.h"
-#import "iSalesDB.h"
+
+
+#import "FileCache.h"
 
 @interface NIDropDown ()
 @property(nonatomic, strong) UITableView *table;
@@ -207,7 +209,7 @@
     cell.textLabel.text=[NSString stringWithFormat:@"%@: %@",selectorname,[item valueForKey:@"title"]];
     NSString* img_url = [item valueForKey:@"pic_url"];
     NSString* file_name=[img_url lastPathComponent];
-    NSData* img_data=[iSalesDB load_cached_img:file_name loadFrom:img_url];
+    NSData* img_data=[FileCache load_cached_img:file_name loadFrom:img_url];
     if(img_data!=nil)
     {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -227,7 +229,7 @@
                 if(downloadimg_data!=nil)
                 {
                     
-                    [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+                    [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
                     
                     UIImage * img =[UIImage imageWithData:downloadimg_data];
                     cell.imageView.image=img;

RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -471,7 +471,7 @@ NSDate * ddate =[dateFormatter dateFromString:@"2023-10-29"];
                             }
                             
                             
-        //                    [iSalesDB cache_img:downloadimg_data filename:file_name saveTo:img_url];
+        //                    [FileCache cache_img:downloadimg_data filename:file_name saveTo:img_url];
         //
         //                    UIImage * img =[UIImage imageWithData:downloadimg_data];
         //                    cell.imageView.image=img;

RedAnt ERP Mobile/common/data_provider/RANetwork.h

@@ -12,7 +12,7 @@
 #import "config.h"
 #import "AppDelegate.h"
 #import "Reachability.h"
-#import "iSalesDB.h"
+
 #import "RAUtils.h"
 #import "NetworkUtils.h"
 #import "OLDataProvider.h"

RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -19,6 +19,8 @@
 #import "ZipArchive.h"
 #import "RADataProvider.h"
 
+#import "FileCache.h"
+
 NSString *const kScreenName = @"kScreenName";
 NSString *const kAction = @"kAction";
 NSString *const kExtra = @"kExtra";
@@ -216,13 +218,13 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
     DebugLog(@"LoadImage:(NSString*) url in:(UIImageView*) container");
     
     NSString* file_name=[url lastPathComponent];
-    NSData* img_data = [iSalesDB load_cached_img:file_name loadFrom:url];
+    NSData* img_data = [FileCache load_cached_img:file_name loadFrom:url];
     if(img_data==nil)
         
     {
         DebugLog(@"IMG NOT CACHED %@",file_name);
         img_data = [NSData dataWithContentsOfURL:[NSURL URLWithString:url]];
-        [iSalesDB cache_img:img_data filename:file_name saveTo:url];
+        [FileCache cache_img:img_data filename:file_name saveTo:url];
         
         //load from internet;
     }

RedAnt ERP Mobile/common/data_provider/iSalesDB.h

@@ -41,7 +41,7 @@ static bool btrigger = true;
 
 + (int) get_recordcount:(sqlite3*)db table:(NSString*) tablename where:(NSString*) whereclause;
 
-+ (NSData*) load_cached_img:(NSString*) filename loadFrom:(NSString*) path;
+//+ (NSData*) load_cached_img:(NSString*) filename loadFrom:(NSString*) path;
 + (void) cache_img: (NSData*) imgData filename:(NSString*) name saveTo:(NSString*) path;
 
 

RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -560,57 +560,57 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
         DebugLog(@"IMG CACHE FAILED,%@",name);
     
 }
-+ (NSData*) load_cached_img:(NSString*) filename loadFrom:(NSString*) path
-{
-    if(path.length==0)
-        return nil;
-//    bool b=        [Singleton sharedInstance].homeItemClick ;
-    path=[path stringByReplacingOccurrencesOfString:@"https://" withString:@""];
-    path=[path stringByReplacingOccurrencesOfString:@"http://" withString:@""];
-    //    path=[path stringByReplacingOccurrencesOfString:filename withString:@""];
-    
-//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-//    
-//    if(appDelegate.bEnable_Cache==false)
+//+ (NSData*) load_cached_img:(NSString*) filename loadFrom:(NSString*) path
+//{
+//    if(path.length==0)
 //        return nil;
-    
-    
-    NSData* data = nil;
-    
-    
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    NSString *cachefolder = [paths objectAtIndex:0];
-    NSString *img_cache = [cachefolder stringByAppendingPathComponent:@"img_cache"];
-    NSString *filePath = [img_cache stringByAppendingPathComponent:path];
-    
-    NSFileManager* fileManager = [NSFileManager defaultManager];
-    if(  [fileManager fileExistsAtPath:filePath ])
-    {
-        data = [NSData dataWithContentsOfFile: filePath];
-    }
-    
-    //    NSString* sqliteQuery = [NSString stringWithFormat:@"SELECT img FROM img_cache WHERE name = '%@'", filename];
-    //    sqlite3_stmt* statement;
-    
-    //    sqlite3 *db = [self get_db];
-    //
-    ////    if( sqlite3_prepare_v2(db, [sqliteQuery UTF8String], -1, &statement, NULL) == SQLITE_OK )
-    ////    {
-    ////        if( sqlite3_step(statement) == SQLITE_ROW )
-    ////        {
-    ////            int length = sqlite3_column_bytes(statement, 0);
-    ////            data       = [NSData dataWithBytes:sqlite3_column_blob(statement, 0) length:length];
-    ////        }
-    ////    }
-    //
-    //    // Finalize and close database.
-    //    sqlite3_finalize(statement);
-    
-    
-    // [iSalesDB close_db:db];
-    return data;
-    
-}
+////    bool b=        [Singleton sharedInstance].homeItemClick ;
+//    path=[path stringByReplacingOccurrencesOfString:@"https://" withString:@""];
+//    path=[path stringByReplacingOccurrencesOfString:@"http://" withString:@""];
+//    //    path=[path stringByReplacingOccurrencesOfString:filename withString:@""];
+//    
+////    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+////    
+////    if(appDelegate.bEnable_Cache==false)
+////        return nil;
+//    
+//    
+//    NSData* data = nil;
+//    
+//    
+//    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+//    NSString *cachefolder = [paths objectAtIndex:0];
+//    NSString *img_cache = [cachefolder stringByAppendingPathComponent:@"img_cache"];
+//    NSString *filePath = [img_cache stringByAppendingPathComponent:path];
+//    
+//    NSFileManager* fileManager = [NSFileManager defaultManager];
+//    if(  [fileManager fileExistsAtPath:filePath ])
+//    {
+//        data = [NSData dataWithContentsOfFile: filePath];
+//    }
+//    
+//    //    NSString* sqliteQuery = [NSString stringWithFormat:@"SELECT img FROM img_cache WHERE name = '%@'", filename];
+//    //    sqlite3_stmt* statement;
+//    
+//    //    sqlite3 *db = [self get_db];
+//    //
+//    ////    if( sqlite3_prepare_v2(db, [sqliteQuery UTF8String], -1, &statement, NULL) == SQLITE_OK )
+//    ////    {
+//    ////        if( sqlite3_step(statement) == SQLITE_ROW )
+//    ////        {
+//    ////            int length = sqlite3_column_bytes(statement, 0);
+//    ////            data       = [NSData dataWithBytes:sqlite3_column_blob(statement, 0) length:length];
+//    ////        }
+//    ////    }
+//    //
+//    //    // Finalize and close database.
+//    //    sqlite3_finalize(statement);
+//    
+//    
+//    // [iSalesDB close_db:db];
+//    return data;
+//    
+//}
 + (int) initializeDb {
     DebugLog (@"initializeDB");
     count_dbconn=0;

RedAnt ERP Mobile/common/pdfCreator/ImageDrawable.m

@@ -8,7 +8,7 @@
 
 #import "ImageDrawable.h"
 #import "ImageUtils.h"
-//#import "iSalesDB.h"
+
 #import "RAUtils.h"
 @implementation ImageDrawable
 

RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/project.pbxproj

@@ -2357,7 +2357,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 231018;
+				CURRENT_PROJECT_VERSION = 231019;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2404,7 +2404,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 231018;
+				CURRENT_PROJECT_VERSION = 231019;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iSales-CONTRAST.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

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

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2321,7 +2321,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2352985;
+				CURRENT_PROJECT_VERSION = 2354628;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2338,7 +2338,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.99;
+				MARKETING_VERSION = 2.00;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2369,7 +2369,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2352985;
+				CURRENT_PROJECT_VERSION = 2354628;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2386,7 +2386,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.99;
+				MARKETING_VERSION = 2.00;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -50,148 +50,149 @@
 #define LOCAL_URL_CUSTOMER_INFO_EDITOR @"customer_info_template"
 #define LOCAL_URL_CUSTOMER_INFO_EDIT @"customer_info_template_edit"
 
-// http://192.168.0.133:8080/site
+// http://192.168.0.112:8080/site
 // http://12.196.120.217
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_BACK_ORDER_PREVIEW  @"http://192.168.0.133/pjHmlg/isales/cartDeliveryBackOrderReview.htm"
-#define  URL_MOVE_TO_BACK_ORDER @"http://192.168.0.133/pjHmlg/isales/moveToBackOrder.htm"
+#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_ORDER_DISCOUNT @""
-#define  URL_UPDATE_AUTH  @"http://192.168.0.133/pjHmlg/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.133/pjHmlg/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.133/pjHmlg/isales/forgotPassword.htm"
+#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_REQUEST_CATMENU  @"http://192.168.0.133/pjHmlg/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.133/pjHmlg/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.133/pjHmlg/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.133/pjHmlg/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.133/pjHmlg/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.133/pjHmlg/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.133/pjHmlg/isales/getContactAdvance.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_ORDER_LIST  @"http://192.168.0.133/pjHmlg/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.133/pjHmlg/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.133/pjHmlg/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.133/pjHmlg/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.133/pjHmlg/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.133/pjHmlg/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.133/pjHmlg/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.133/pjHmlg/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.133/pjHmlg/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.133/pjHmlg/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.133/pjHmlg/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.133/pjHmlg/isales/cancelOrder.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_CART_SET_PRICE  @"http://192.168.0.133/pjHmlg/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.133/pjHmlg/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.133/pjHmlg/isales/updateGeneralNote.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_INCRESEMENT  @"http://192.168.0.133/pjHmlg/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.133/pjHmlg/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.133/pjHmlg/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.133/pjHmlg/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.133/pjHmlg/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.133/pjHmlg/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.133/pjHmlg/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.133/pjHmlg/isales/wishlistRemoveToCart.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_CATEGORYADDALL  @"http://192.168.0.133/pjHmlg/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"http://192.168.0.133/pjHmlg/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"http://192.168.0.133/pjHmlg/isales/itemSearchAddAllTo.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_ITEM_DETAIL  @"http://192.168.0.133/pjHmlg/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.112/pjHmlg/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.133/pjHmlg/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.133/pjHmlg/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.133/pjHmlg/isales/deleteToWishList.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_PORTFOLIO @"http://192.168.0.133/pjHmlg/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.133/pjHmlg/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.133/pjHmlg/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.133/pjHmlg/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.133/pjHmlg/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.133/pjHmlg/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.133/pjHmlg/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.133/pjHmlg/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.133/pjHmlg/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.133/pjHmlg/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.133/pjHmlg/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.133/pjHmlg/isales/getTearSheetAvailableQty.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_CONTACT_LIST  @"http://192.168.0.133/pjHmlg/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.133/pjHmlg/isales/getShipToContact.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_ADDRESS_EDOTOR  @"http://192.168.0.133/pjHmlg/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.133/pjHmlg/isales/saveAddress.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_CREDITCARD_EDOTOR  @"http://192.168.0.133/pjHmlg/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.133/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_CUSTOMER_INFO  @"http://192.168.0.133/pjHmlg/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.133/pjHmlg/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.133/pjHmlg/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.133/pjHmlg/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.133/pjHmlg/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.133/pjHmlg/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.133/pjHmlg/isales/updateCustomerBusiCard.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_ERR_LOG  @"http://192.168.0.133/pjHmlg/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.112/pjHmlg/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.133/pjHmlg/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.112/pjHmlg/isales/uploadImg.htm"
 
 
-#define  URL_NPD_POLICY  @"http://192.168.0.133/pjHmlg/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.112/pjHmlg/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.133:8080/site/offline/initDatas.htm"
-#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.133:8080/site/offline/uploadOfflineData.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_DOWNLOAD_OFFLINE  @"http://192.168.0.133:8080/site/offline/downloadDatas.htm"
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.133:8080/site/offline/confirmVersion.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_GET_RESULT  @"http://192.168.0.133:8080/site/offline/getResultBySerial.htm"
+#define  URL_GET_RESULT  @"http://192.168.0.112:8080/site/offline/getResultBySerial.htm"
 
-#define URL_SET_PRICE_TYPE @"http://192.168.0.133/pjHmlg/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"http://192.168.0.112/pjHmlg/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"http://192.168.0.133/pjHmlg/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"http://192.168.0.112/pjHmlg/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"http://192.168.0.133/pjHmlg/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"http://192.168.0.112/pjHmlg/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"http://192.168.0.133/pjHmlg/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"http://192.168.0.112/pjHmlg/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"http://192.168.0.133/pjHmlg/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"http://192.168.0.112/pjHmlg/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"http://192.168.0.133/pjHmlg/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"http://192.168.0.112/pjHmlg/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"http://192.168.0.133/pjHmlg/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"http://192.168.0.112/pjHmlg/isales/notifyMeEmail.htm"
 
-#define URL_EMAIL_WISHLIST @"http://192.168.0.133/pjHmlg/isales/sendWishListEmail.htm"
+#define URL_EMAIL_WISHLIST @"http://192.168.0.112/pjHmlg/isales/sendWishListEmail.htm"
 
-#define URL_BLOG @"http://192.168.0.133:8080/site/blog"
+#define URL_BLOG @"http://192.168.0.112:8080/site/blog"
 
 #define URL_PRIVACY @""
 
-#define  URL_DELETE_ACCOUNT  @"http://192.168.0.133/pjHmlg/isales/cancelAccount.htm"
-
+#define  URL_DELETE_ACCOUNT  @"http://192.168.0.112/pjHmlg/isales/cancelAccount.htm"
+#define URL_CHANGE_PASSWORD @""
+#define URL_SIGN_UP @""
 #else