Browse Source

erp mobile

compatible fix

Ray Zhang 2 năm trước cách đây
mục cha
commit
74285fae5a
29 tập tin đã thay đổi với 186 bổ sung177 xóa
  1. 1 0
      RedAnt ERP Mobile/HMLG Scan Order/RAQRCodeScannerViewController.m
  2. 1 0
      RedAnt ERP Mobile/HMLG Scan Order/StockViewController.m
  3. 1 1
      RedAnt ERP Mobile/common/AutoScrollImage/CycleScrollView.m
  4. 9 4
      RedAnt ERP Mobile/common/Functions/cart/CartViewController.m
  5. 1 1
      RedAnt ERP Mobile/common/Functions/signature/SViewController.m
  6. 1 0
      RedAnt ERP Mobile/common/Functions/signature/SignatureView.m
  7. 1 0
      RedAnt ERP Mobile/common/Functions/signature/SignatureViewM.m
  8. 1 1
      RedAnt ERP Mobile/common/JKLock/JKLockController.m
  9. 1 1
      RedAnt ERP Mobile/common/PDFUtils.m
  10. 1 1
      RedAnt ERP Mobile/common/TextUtils.m
  11. 18 18
      RedAnt ERP Mobile/common/const.h
  12. 1 1
      RedAnt ERP Mobile/common/customUI/SimpleGrid.m
  13. 1 1
      RedAnt ERP Mobile/common/data_provider/iSalesDB.m
  14. 1 0
      RedAnt ERP Mobile/common/pdfCreator/LineDrawable.m
  15. 1 0
      RedAnt ERP Mobile/common/pdfCreator/RAPDFPage.m
  16. 1 0
      RedAnt ERP Mobile/common/pdfCreator/pdfCreator.m
  17. 1 0
      RedAnt ERP Mobile/common/photoStack/PhotoStackViewController.m
  18. 86 86
      RedAnt ERP Mobile/iSales-CONTRAST/config.h
  19. 2 2
      RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard
  20. 20 26
      common/Camera/Camera.storyboard
  21. 1 1
      common/FileCache.m
  22. 1 0
      common/RAConvertor.m
  23. 9 10
      common/RAUtils.h
  24. 1 0
      common/ScannerViewController.m
  25. 1 1
      common/Youtube/RAYTPlayer.m
  26. 20 20
      common/common_const.h
  27. 1 0
      common/customUI/CustomIOSAlertView.m
  28. 1 1
      common/customUI/commoneditor/EnumSelectAndSort/EnumSelectAndSortViewController.m
  29. 1 1
      common/upload/RANetworkTaskDelegate.m

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

@@ -10,6 +10,7 @@
 #import <AVKit/AVKit.h>
 #import "config.h"
 #import "const.h"
+#import "RAUtils.h"
 
 @interface RAQRCodeScannerViewController () <AVCaptureMetadataOutputObjectsDelegate>
 

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

@@ -11,6 +11,7 @@
 #import "DefaultTableHeaderView.h"
 #import "DefaultAppearance.h"
 #import "const.h"
+#import "RAUtils.h"
 @interface StockViewController ()
 
 @end

+ 1 - 1
RedAnt ERP Mobile/common/AutoScrollImage/CycleScrollView.m

@@ -10,7 +10,7 @@
 #import "NSTimer+Addition.h"
 #import "SliderPage.h"
 #import "HWWeakTimer.h"
-
+#import "RAUtils.h"
 @interface CycleScrollView () <UIScrollViewDelegate>
 
 @property (nonatomic , assign) NSInteger currentPageIndex;

+ 9 - 4
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -698,6 +698,8 @@
 
 -(void) operation_reload_data
 {
+    
+//    self.stop_response=false;
     if (self.dataOperationQueue.operationCount > 1) {
         
         DebugLog(@"operationCount >1 cancel");
@@ -749,7 +751,8 @@
             [RANetwork request_cart:weakself.sortIndex completionHandler:^(NSMutableDictionary *result) {
                         DebugLog(@"BEGIN LOAD CART");
                         NSDictionary* cart_json = result;
-                        
+                //?????
+                
                         //
                         //                [self.mum stopAnimating];
 //                        [loadingView dismissViewControllerAnimated:YES completion:^{
@@ -833,7 +836,7 @@
 //                        }];
 
                         
-                        
+                self.stop_response=false;
                     }];
 
 //        }];
@@ -861,14 +864,14 @@
         appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
     });
 //    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
-#ifndef SCANNER_ORDER
+//#ifndef SCANNER_ORDER
     
     //扫码订单允许后建订单
     if (appDelegate.order_code == nil || appDelegate.order_code.length == 0) {
         [self clearContent];
         return;
     }
-#endif
+//#endif
     
     __weak typeof(self) weakself = self;
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -4533,6 +4536,8 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
             }
             else
             {
+                
+                
                 self.stop_response=true;
                 
                 [RAUtils playSound:@"wrong" type:@"wav"];

+ 1 - 1
RedAnt ERP Mobile/common/Functions/signature/SViewController.m

@@ -8,7 +8,7 @@
 #define INTNUMBERS @"0123456789\n"
 #import "SViewController.h"
 #import "const.h"
-
+#import "RAUtils.h"
 @interface SViewController ()
 
 @end

+ 1 - 0
RedAnt ERP Mobile/common/Functions/signature/SignatureView.m

@@ -9,6 +9,7 @@
 #import "SignatureView.h"
 #import <OpenGLES/ES2/glext.h>
 #import "const.h"
+#import "RAUtils.h"
 
 //
 //@interface SignatureView ()

+ 1 - 0
RedAnt ERP Mobile/common/Functions/signature/SignatureViewM.m

@@ -8,6 +8,7 @@
 
 #import "SignatureViewM.h"
 #import "const.h"
+#import "RAUtils.h"
 //#import "AAPLRenderer.h"
 #define       STROKE_WIDTH_SMOOTHING 0.5   // Low pass filter alpha
 

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

@@ -11,7 +11,7 @@
 #import "JKDotView.h"
 #import "JKMessageBoxController.h"
 #import "AppDelegate.h"
-
+#import "RAUtils.h"
 #define Password_Length 4
 #define Dot_Interval 60
 #define Dot_Width 20

+ 1 - 1
RedAnt ERP Mobile/common/PDFUtils.m

@@ -11,7 +11,7 @@
 #import "ImageDrawable.h"
 #import "TextDrawable.h"
 #import "RectDrawable.h"
-
+#import "RAUtils.h"
 
 @implementation PDFUtils
 

+ 1 - 1
RedAnt ERP Mobile/common/TextUtils.m

@@ -7,7 +7,7 @@
 //
 
 #import "TextUtils.h"
-
+#import "RAUtils.h"
 @implementation TextUtils
 
 

+ 18 - 18
RedAnt ERP Mobile/common/const.h

@@ -5,24 +5,24 @@
 //  Created by Ray on 14-6-20.
 //  Copyright (c) 2014年 United Software Applications, Inc. All rights reserved.
 //
-#define DEBUGLOG 1
-#ifdef DEBUGLOG
-    #ifdef DEBUG
-   //     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
-#define DebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n", self, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
-
-#define blockDebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n",weakself, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
-
-    #else
-        #define DebugLog( s, ... )
-
-        #define blockDebugLog( s, ... )
-    #endif
-#else
-    #define DebugLog( s, ... )
-
-    #define blockDebugLog( s, ... )
-#endif
+//#define DEBUGLOG 1
+//#ifdef DEBUGLOG
+//    #ifdef DEBUG
+//   //     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
+//#define DebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n", self, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+//
+//#define blockDebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n",weakself, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+//
+//    #else
+//        #define DebugLog( s, ... )
+//
+//        #define blockDebugLog( s, ... )
+//    #endif
+//#else
+//    #define DebugLog( s, ... )
+//
+//    #define blockDebugLog( s, ... )
+//#endif
 
 
 #define DEPRECATED(_version) __attribute__((deprecated))

+ 1 - 1
RedAnt ERP Mobile/common/customUI/SimpleGrid.m

@@ -8,7 +8,7 @@
 
 #import "SimpleGrid.h"
 //#import "Constant.h"
-
+#import "RAUtils.h"
 
 #define COLOR(R,G,B,A) [UIColor colorWithRed:R/255.0 green:G/255.0 blue:B/255.0 alpha:A]
 @implementation SimpleGrid

+ 1 - 1
RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -10,7 +10,7 @@
 #import "AESCrypt.h"
 //#import "AppDelegate.h"
 #import "RASingleton.h"
-
+#import "RAUtils.h"
 NSLock *dblock ;
 int count_dbconn;
 //int count_tmpdbconn;

+ 1 - 0
RedAnt ERP Mobile/common/pdfCreator/LineDrawable.m

@@ -7,6 +7,7 @@
 //
 
 #import "LineDrawable.h"
+#import "RAUtils.h"
 
 @implementation LineDrawable
 

+ 1 - 0
RedAnt ERP Mobile/common/pdfCreator/RAPDFPage.m

@@ -13,6 +13,7 @@
 #import "TextDrawable.h"
 #import "TableDrawable.h"
 #import "GridDrawable.h"
+#import "RAUtils.h"
 
 @implementation RAPDFPage
 -(instancetype) init:(NSMutableDictionary *)page size:(CGRect)rect

+ 1 - 0
RedAnt ERP Mobile/common/pdfCreator/pdfCreator.m

@@ -9,6 +9,7 @@
 #import "pdfCreator.h"
 #import "UIKit/UIDocument.h"
 
+#import "RAUtils.h"
 #import "RAPDFPage.h"
 @implementation pdfCreator
 

+ 1 - 0
RedAnt ERP Mobile/common/photoStack/PhotoStackViewController.m

@@ -8,6 +8,7 @@
 
 #import "PhotoStackViewController.h"
 #import "const.h"
+#import "RAUtils.h"
 
 @interface PhotoStackViewController ()
     @property (nonatomic, strong) NSArray *photos;

+ 86 - 86
RedAnt ERP Mobile/iSales-CONTRAST/config.h

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

+ 2 - 2
RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -300,7 +300,7 @@
                                                     <rect key="frame" x="10" y="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" image="button:hrK-DY-RbO:image"/>
-                                                    <state key="selected" image="4B855F13-5BF6-4A18-8FC9-75FDE7163D19"/>
+                                                    <state key="selected" image="4FBFC13B-0677-4DBA-9B05-450167191EDC"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
@@ -1019,7 +1019,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="4B855F13-5BF6-4A18-8FC9-75FDE7163D19" width="24" height="24">
+        <image name="4FBFC13B-0677-4DBA-9B05-450167191EDC" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T

+ 20 - 26
common/Camera/Camera.storyboard

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina5_5" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -84,20 +82,20 @@
                                 </variation>
                             </view>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="7JX-sr-Mw8"/>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="aIR-II-sqh" firstAttribute="leading" secondItem="ZFi-1H-xB4" secondAttribute="leading" id="1yp-i3-hXU"/>
+                            <constraint firstItem="aIR-II-sqh" firstAttribute="leading" secondItem="7JX-sr-Mw8" secondAttribute="leading" id="1yp-i3-hXU"/>
                             <constraint firstItem="aIR-II-sqh" firstAttribute="width" secondItem="ZFi-1H-xB4" secondAttribute="width" id="3jE-Zo-qAc"/>
-                            <constraint firstItem="fLT-zm-dh6" firstAttribute="bottom" secondItem="2cM-nE-ueF" secondAttribute="bottom" id="9Y0-7J-sXY"/>
-                            <constraint firstItem="2cM-nE-ueF" firstAttribute="leading" secondItem="fLT-zm-dh6" secondAttribute="leading" id="Igd-YW-xgj"/>
+                            <constraint firstItem="7JX-sr-Mw8" firstAttribute="bottom" secondItem="2cM-nE-ueF" secondAttribute="bottom" id="9Y0-7J-sXY"/>
+                            <constraint firstItem="2cM-nE-ueF" firstAttribute="leading" secondItem="7JX-sr-Mw8" secondAttribute="leading" id="Igd-YW-xgj"/>
                             <constraint firstItem="aIR-II-sqh" firstAttribute="top" secondItem="ZFi-1H-xB4" secondAttribute="top" id="c6A-tS-Txg"/>
-                            <constraint firstItem="mbh-f5-Pjk" firstAttribute="leading" secondItem="fLT-zm-dh6" secondAttribute="leading" constant="10" id="d8B-Ug-GS1"/>
-                            <constraint firstItem="2cM-nE-ueF" firstAttribute="top" secondItem="fLT-zm-dh6" secondAttribute="top" id="fox-Pf-jXw"/>
+                            <constraint firstItem="mbh-f5-Pjk" firstAttribute="leading" secondItem="7JX-sr-Mw8" secondAttribute="leading" constant="10" id="d8B-Ug-GS1"/>
+                            <constraint firstItem="2cM-nE-ueF" firstAttribute="top" secondItem="7JX-sr-Mw8" secondAttribute="top" id="fox-Pf-jXw"/>
                             <constraint firstItem="aIR-II-sqh" firstAttribute="height" secondItem="ZFi-1H-xB4" secondAttribute="height" id="k6W-n9-nE2"/>
-                            <constraint firstItem="fLT-zm-dh6" firstAttribute="trailing" secondItem="2cM-nE-ueF" secondAttribute="trailing" id="plK-cA-ZV1"/>
-                            <constraint firstItem="mbh-f5-Pjk" firstAttribute="top" secondItem="fLT-zm-dh6" secondAttribute="top" constant="20" id="vud-1w-6K9"/>
+                            <constraint firstItem="7JX-sr-Mw8" firstAttribute="trailing" secondItem="2cM-nE-ueF" secondAttribute="trailing" id="plK-cA-ZV1"/>
+                            <constraint firstItem="mbh-f5-Pjk" firstAttribute="top" secondItem="7JX-sr-Mw8" secondAttribute="top" constant="20" id="vud-1w-6K9"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="fLT-zm-dh6"/>
                     </view>
                     <connections>
                         <outlet property="backBtn" destination="mbh-f5-Pjk" id="h8n-RN-SL7"/>
@@ -114,10 +112,6 @@
         <scene sceneID="Y0T-nH-52O">
             <objects>
                 <viewController storyboardIdentifier="RATakePhotoPreviewController" automaticallyAdjustsScrollViewInsets="NO" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hfm-f2-DNT" customClass="RATakePhotoPreviewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="JtE-cJ-OW0"/>
-                        <viewControllerLayoutGuide type="bottom" id="1aO-Vd-AQh"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="khP-jm-wId">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -166,21 +160,21 @@
                                 </connections>
                             </button>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="POD-Ik-ETe"/>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="1aO-Vd-AQh" firstAttribute="top" secondItem="WfP-Fk-mo9" secondAttribute="bottom" id="18i-Al-Ypd"/>
-                            <constraint firstItem="BrA-yF-F9H" firstAttribute="trailing" secondItem="ZBU-jX-GTo" secondAttribute="trailing" constant="50" id="1MK-Io-C0h"/>
-                            <constraint firstItem="1aO-Vd-AQh" firstAttribute="top" secondItem="XlI-8n-qRu" secondAttribute="bottom" constant="75" id="I6O-uF-hVL"/>
-                            <constraint firstItem="XlI-8n-qRu" firstAttribute="leading" secondItem="BrA-yF-F9H" secondAttribute="leading" constant="50" id="M5Y-yj-q9i"/>
-                            <constraint firstItem="WfP-Fk-mo9" firstAttribute="leading" secondItem="khP-jm-wId" secondAttribute="leading" id="MSv-jh-Kws"/>
+                            <constraint firstItem="POD-Ik-ETe" firstAttribute="bottom" secondItem="WfP-Fk-mo9" secondAttribute="bottom" id="18i-Al-Ypd"/>
+                            <constraint firstItem="POD-Ik-ETe" firstAttribute="trailing" secondItem="ZBU-jX-GTo" secondAttribute="trailing" constant="50" id="1MK-Io-C0h"/>
+                            <constraint firstItem="POD-Ik-ETe" firstAttribute="bottom" secondItem="XlI-8n-qRu" secondAttribute="bottom" constant="75" id="I6O-uF-hVL"/>
+                            <constraint firstItem="XlI-8n-qRu" firstAttribute="leading" secondItem="POD-Ik-ETe" secondAttribute="leading" constant="50" id="M5Y-yj-q9i"/>
+                            <constraint firstItem="WfP-Fk-mo9" firstAttribute="leading" secondItem="POD-Ik-ETe" secondAttribute="leading" id="MSv-jh-Kws"/>
                             <constraint firstAttribute="bottom" secondItem="w4v-z1-b7B" secondAttribute="bottom" id="ZV0-ao-dGH"/>
-                            <constraint firstItem="w4v-z1-b7B" firstAttribute="leading" secondItem="khP-jm-wId" secondAttribute="leading" id="eWS-j0-eyB"/>
-                            <constraint firstAttribute="trailing" secondItem="w4v-z1-b7B" secondAttribute="trailing" id="qYR-pg-xfY"/>
+                            <constraint firstItem="w4v-z1-b7B" firstAttribute="leading" secondItem="POD-Ik-ETe" secondAttribute="leading" id="eWS-j0-eyB"/>
+                            <constraint firstItem="POD-Ik-ETe" firstAttribute="trailing" secondItem="w4v-z1-b7B" secondAttribute="trailing" id="qYR-pg-xfY"/>
                             <constraint firstItem="ZBU-jX-GTo" firstAttribute="centerY" secondItem="XlI-8n-qRu" secondAttribute="centerY" id="uMc-9T-hZd"/>
                             <constraint firstItem="w4v-z1-b7B" firstAttribute="top" secondItem="khP-jm-wId" secondAttribute="top" id="vBb-3e-ld9"/>
-                            <constraint firstAttribute="trailing" secondItem="WfP-Fk-mo9" secondAttribute="trailing" id="wKB-RK-2W0"/>
+                            <constraint firstItem="POD-Ik-ETe" firstAttribute="trailing" secondItem="WfP-Fk-mo9" secondAttribute="trailing" id="wKB-RK-2W0"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="BrA-yF-F9H"/>
                     </view>
                     <nil key="simulatedStatusBarMetrics"/>
                     <nil key="simulatedTopBarMetrics"/>

+ 1 - 1
common/FileCache.m

@@ -9,7 +9,7 @@
 #import "FileCache.h"
 #import "AppDelegate.h"
 #import "const.h"
-
+#import "RAUtils.h"
 
 @implementation FileCache
 

+ 1 - 0
common/RAConvertor.m

@@ -8,6 +8,7 @@
 
 #import "RAConvertor.h"
 #import "const.h"
+#import "RAUtils.h"
 
 @implementation RAConvertor
 

+ 9 - 10
common/RAUtils.h

@@ -18,24 +18,23 @@
 //    
 //}MyTestStruct;
 
-#define DEBUGLOG 1
-
+#define DEBUGLOG 
 #ifdef DEBUGLOG
-#ifdef DEBUG
-//     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
+    #ifdef DEBUG
+   //     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
 #define DebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n", self, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
 
 #define blockDebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n",weakself, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
 
-#else
-#define DebugLog( s, ... )
+    #else
+        #define DebugLog( s, ... )
 
-#define blockDebugLog( s, ... )
-#endif
+        #define blockDebugLog( s, ... )
+    #endif
 #else
-#define DebugLog( s, ... )
+    #define DebugLog( s, ... )
 
-#define blockDebugLog( s, ... )
+    #define blockDebugLog( s, ... )
 #endif
 
 

+ 1 - 0
common/ScannerViewController.m

@@ -26,6 +26,7 @@
 //#import "MainViewController.h"
 //#import "ContactListViewController.h"
 //#import "CartUtils.h"
+#import "RAUtils.h"
 
 #define SCANNER_TARGET_DETAIL 0
 #define SCANNER_TARGET_CART 1

+ 1 - 1
common/Youtube/RAYTPlayer.m

@@ -8,7 +8,7 @@
 
 #import "RAYTPlayer.h"
 #import "const.h"
-
+#import "RAUtils.h"
 @interface RAYTPlayer ()
 
 

+ 20 - 20
common/common_const.h

@@ -7,26 +7,26 @@
 
 #ifndef common_const_h
 #define common_const_h
-
-#define DEBUGLOG 1
-
-#ifdef DEBUGLOG
-#ifdef DEBUG
-//     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
-#define DebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n", self, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
-
-#define blockDebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n",weakself, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
-
-#else
-#define DebugLog( s, ... )
-
-#define blockDebugLog( s, ... )
-#endif
-#else
-#define DebugLog( s, ... )
-
-#define blockDebugLog( s, ... )
-#endif
+//
+//#define DEBUGLOG 1
+//
+//#ifdef DEBUGLOG
+//#ifdef DEBUG
+////     #define DebugLog( s, ... ) fprintf(stderr,"%s\n",[[NSString stringWithFormat:s, ##__VA_ARGS__] UTF8String])//
+//#define DebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n", self, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+//
+//#define blockDebugLog( s, ... ) fprintf(stderr, "<%p %s:(%d)> %s \n",weakself, [[[NSString stringWithUTF8String:__FILE__] lastPathComponent]UTF8String], __LINE__, [[NSString stringWithFormat:(s), ##__VA_ARGS__]UTF8String] )
+//
+//#else
+//#define DebugLog( s, ... )
+//
+//#define blockDebugLog( s, ... )
+//#endif
+//#else
+//#define DebugLog( s, ... )
+//
+//#define blockDebugLog( s, ... )
+//#endif
 
 #define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
 #define UIColorFromRGBAlpha(rgbValue,alp) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:(alp)]

+ 1 - 0
common/customUI/CustomIOSAlertView.m

@@ -12,6 +12,7 @@
 #import "CustomIOSAlertView.h"
 #import <QuartzCore/QuartzCore.h>
 #import "const.h"
+#import "RAUtils.h"
 
 const static CGFloat kCustomIOSAlertViewDefaultButtonHeight       = 50;
 const static CGFloat kCustomIOSAlertViewDefaultButtonSpacerHeight = 1;

+ 1 - 1
common/customUI/commoneditor/EnumSelectAndSort/EnumSelectAndSortViewController.m

@@ -10,7 +10,7 @@
 #import "EnumSelectAndSortCell.h"
 #import "EnumModel.h"
 #import "const.h"
-
+#import "RAUtils.h"
 @interface EnumSelectAndSortViewController () <UITableViewDelegate,UITableViewDataSource,UISearchBarDelegate>
 
 @property (nonatomic,strong) NSDictionary *dicDataSource;

+ 1 - 1
common/upload/RANetworkTaskDelegate.m

@@ -8,7 +8,7 @@
 
 #import "RANetworkTaskDelegate.h"
 #import "const.h"
-
+#import "RAUtils.h"
 
 @interface JLFileStream : NSObject