Quellcode durchsuchen

1.修改UWAVER按钮图标、定义BUILD_UWAVER代码区分其他工程。

Pen Li vor 8 Jahren
Ursprung
Commit
46ce7fc298
100 geänderte Dateien mit 557 neuen und 32 gelöschten Zeilen
  1. 2 2
      RedAnt ERP Mobile/common/ERPUtils.m
  2. 2 1
      RedAnt ERP Mobile/common/Functions/MainViewController.m
  3. 1 1
      RedAnt ERP Mobile/common/Functions/cart/CartViewController.m
  4. 1 1
      RedAnt ERP Mobile/common/Functions/category/CategorySearchFilterViewController.m
  5. 1 1
      RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m
  6. 1 1
      RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m
  7. 1 1
      RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m
  8. 1 1
      RedAnt ERP Mobile/common/Functions/order/CreateOrderViewController.m
  9. 12 12
      RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m
  10. 2 2
      RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m
  11. 3 3
      RedAnt ERP Mobile/common/data_provider/RANetwork.m
  12. 0 6
      RedAnt ERP Mobile/iSales-UWAVER/AppDelegate.m
  13. 66 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/Contents.json
  14. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-1.png
  15. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-2.png
  16. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-3.png
  17. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-4.png
  18. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-5.png
  19. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-6.png
  20. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon.png
  21. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/homelegance.png
  22. 6 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/Contents.json
  23. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/Contents.json
  24. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/DX_18.png
  25. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/DX_18@2x.png
  26. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/DX_18@3x.png
  27. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/Contents.json
  28. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/DX_22.png
  29. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/DX_22@2x.png
  30. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/DX_22@3x.png
  31. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/Contents.json
  32. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/IS_18.png
  33. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/IS_18@2x.png
  34. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/IS_18@3x.png
  35. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/Contents.json
  36. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/IS_22.png
  37. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/IS_22@2x.png
  38. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/IS_22@3x.png
  39. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/Contents.json
  40. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/IX_18.png
  41. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/IX_18@2x.png
  42. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/IX_18@3x.png
  43. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/Contents.json
  44. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/IX_22.png
  45. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/IX_22@2x.png
  46. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/IX_22@3x.png
  47. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/Contents.json
  48. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/TS_18.png
  49. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/TS_18@2x.png
  50. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/TS_18@3x.png
  51. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/Contents.json
  52. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/TS_22.png
  53. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/TS_22@2x.png
  54. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/TS_22@3x.png
  55. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/Contents.json
  56. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/TX_18.png
  57. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/TX_18@2x.png
  58. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/TX_18@3x.png
  59. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/Contents.json
  60. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/TX_22.png
  61. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/TX_22@2x.png
  62. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/TX_22@3x.png
  63. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/Contents.json
  64. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/appicon-1.png
  65. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/appicon-2.png
  66. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/appicon.png
  67. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/Contents.json
  68. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/appicon-1.png
  69. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/appicon-2.png
  70. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/appicon.png
  71. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/Contents.json
  72. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/add(1).png
  73. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/add(1)@2x.png
  74. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/add(1)@3x.png
  75. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/Contents.json
  76. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/appicon-1.png
  77. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/appicon-2.png
  78. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/appicon.png
  79. 21 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/appicon.imageset/Contents.json
  80. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/appicon.imageset/appicon.png
  81. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/Contents.json
  82. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/appicon-1.png
  83. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/appicon-2.png
  84. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/appicon.png
  85. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/Contents.json
  86. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/back.png
  87. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/back@2x.png
  88. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/back@3x.png
  89. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/CAR.png
  90. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/CAR248.png
  91. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/CAR372.png
  92. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/Contents.json
  93. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/Contents.json
  94. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/portfolio124.png
  95. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/portfolio248.png
  96. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/portfolio372.png
  97. 23 0
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/Contents.json
  98. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/WISHLIST124.png
  99. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/WISHLIST248.png
  100. BIN
      RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/WISHLIST372.png

+ 2 - 2
RedAnt ERP Mobile/common/ERPUtils.m

@@ -182,7 +182,7 @@
 //    URL_LOGOUT
 //    URL_RETRIEVE_PASS // forget password
 //    URL_REQUEST_LOGIN // request login
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     if ([urlString isEqualToString:URL_REQUEST_LOGIN] || [urlString isEqualToString:URL_RETRIEVE_PASS] || [urlString isEqualToString:URL_UPDATE_AUTH]) {
         return @"Login View";
     }
@@ -253,7 +253,7 @@
 
 + (void)googleAnalyticsSendRequestString:(NSString *)urlString WithScreen:(NSString *)screenName Action:(NSString *)action Extra:(NSDictionary *)extra {
 
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     if (!screenName && !action && !extra) {
         return;
     }

+ 2 - 1
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1719,7 +1719,7 @@
     //    [map setValue:@"rect_search_history" forKey:@"img"];
     //    [self.sideMenuItems addObject:map.copy];
     //
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     [map setValue:@"Scanner Setting" forKey:@"title"];
     [map setValue:@"rect_change_password" forKey:@"img"];
     [self.sideMenuItems addObject:map.copy];
@@ -2186,6 +2186,7 @@
 #ifdef BUILD_USAI
         NSString* title = @"USAI BLOG";
 #endif
+
         
         title = [NSString stringWithFormat:@"%@ BLOG",COMPANY_SHORT_NAME];
         

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

@@ -2621,7 +2621,7 @@
         NSMutableArray* arr=[@[] mutableCopy];
 
         BOOL condition = outOfStock;
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
 #ifdef OFFLINE_MODE
         condition = !appDelegate.offline_mode && outOfStock;
 #endif

+ 1 - 1
RedAnt ERP Mobile/common/Functions/category/CategorySearchFilterViewController.m

@@ -614,7 +614,7 @@
 - (void)treeView:(RATreeView *)treeView didSelectRowForItem:(id)item treeNodeInfo:(RATreeNodeInfo *)treeNodeInfo
 {
     
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     NSDictionary *data = item;
     int count = [[data valueForKey:@"count"] intValue];
     if(count==0)

+ 1 - 1
RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -232,7 +232,7 @@
     
     filterVC.OkClick =^(NSString *ids,NSString* modelname,NSString* modeldescrip,NSString* available,NSString* QTY,NSString* alert,NSString* price,NSString* bestseller)
     {
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
         NSArray *idArr = [ids componentsSeparatedByString:@","];
         if (idArr.count == 1) {
             self.categoryString = [@"Category" stringByAppendingString:[self categoryString:ids node:menu level:0]];

+ 1 - 1
RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -1104,7 +1104,7 @@ self.isrefreshing=false;
 #endif
         } else {
             
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
             NSString *qtyStr = [section_json valueForKey:@"Availability"];
             
             __weak typeof(self) weakself = self;

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

@@ -4198,7 +4198,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                 }
                 
             }
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
             cuft=ucbf*count;
             weight= uweight*count;
 #endif

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

@@ -296,7 +296,7 @@
     
     UIImage *submit_img = [[UIImage imageNamed:@"commit"] imageWithRenderingMode:UIImageRenderingModeAutomatic];
     
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     submit_img = [[UIImage imageNamed:@"submit_red"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
 #endif
     

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

@@ -401,7 +401,7 @@
     ViewController.mail_to = send_to;
     NSString* subject = nil;
     
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     subject=[NSString stringWithFormat:@"%@ -- SO# %@ from %@",company,so,COMPANY_NAME];
     
     if (appDelegate.user_type == USER_ROLE_CUSTOMER&&self.is_shoporder) {
@@ -687,7 +687,7 @@
                             //                                [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
                             //                                if(self.selectOrder)
                             //                                    self.selectOrder(self.content_data);
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
                             int count = [[self.content_data objectForKey:@"count"] intValue];
                             for (int i = 0; i < count; i++) {
                                 NSString *key = [NSString stringWithFormat:@"section_%d",i];
@@ -775,7 +775,7 @@
                             if([[order_json valueForKey:@"result"] intValue]==2)
                             {
                                 
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
                                 int count = [[weakSelf.content_data objectForKey:@"count"] intValue];
                                 for (int i = 0; i < count; i++) {
                                     NSString *key = [NSString stringWithFormat:@"section_%d",i];
@@ -1363,7 +1363,7 @@
     //        return 150;
     
  
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     NSDictionary *section_item = [self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",indexPath.section]];
     NSDictionary *data = [section_item objectForKey:@"data"];
     NSString *type = [section_item objectForKey:@"type"];
@@ -1568,7 +1568,7 @@
     
     NSString*labeltitle = nil;
     
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     NSDictionary *section_item = [self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",section]];
     NSString *title = [section_item objectForKey:@"title"];
     labeltitle = title;
@@ -1748,7 +1748,7 @@
      self.content_data_control = [self translate_json:self.content_data_download changed:self.changed_data];
      
      */
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     NSUInteger section = sender.tag;
     NSMutableDictionary *section_item = [[self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",section]] mutableCopy];
     NSString *title = [section_item objectForKey:@"title"];
@@ -1857,7 +1857,7 @@
     
     if(self.content_data==nil)
         return 0;
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     return [[self.content_data objectForKey:@"count"] integerValue];
 #endif
     
@@ -1879,7 +1879,7 @@
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     
     NSDictionary *section_item = [self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",section]];
     NSDictionary *data = [section_item objectForKey:@"data"];
@@ -1974,7 +1974,7 @@
         }
     }
     if(section==3) {
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
         return 6;
 #endif
         
@@ -1999,7 +1999,7 @@
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
  
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     /**
      * ver1.90
      */
@@ -3181,7 +3181,7 @@
                     cell.priceLabel.text =[self.content_data valueForKey:@"Shipping"];
                     break;
                 case 2: {
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
                     cell.chargeLabel.text = @"Liftgate Fee(No loading dock):";
                     cell.priceLabel.text =[self.content_data valueForKey:@"Liftgate Fee(No loading dock)"];
 #endif
@@ -3199,7 +3199,7 @@
                 }
                     break;
                 case 3: {
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
                     cell.chargeLabel.text = @"Handling Fee:";
                     cell.priceLabel.text =[self.content_data valueForKey:@"Handling Fee"];
 #endif

+ 2 - 2
RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m

@@ -41,7 +41,7 @@
     self.requestLoginBtn.hidden = YES;
 #endif
     
-#if defined(BUILD_HOMER) || defined(BUILD_GATIT)
+#if defined(BUILD_HOMER) || defined(BUILD_GATIT) || defined(BUILD_UWAVER)
     self.title=COMPANY_SHORT_NAME;
     self.checkOfflineMode.hidden = YES;
     self.requestLoginBtn.hidden = YES;
@@ -517,7 +517,7 @@
 
 - (IBAction)requestLoginBtnClicked:(UIButton *)sender {
 
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     WebViewController *webVC = [self.storyboard instantiateViewControllerWithIdentifier:@"WebViewController"];
     webVC.url = URL_REQUEST_LOGIN;
     webVC.title = @"Request Login";

+ 3 - 3
RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -286,7 +286,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
         }
         [extra setObject:[params objectForKey:@"user"] forKey:@"user"];
     }
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
     [ERPUtils googleAnalyticsSendRequestString:url WithScreen:screenName Action:userAction Extra:extra];
 #endif
     return [self get_json:url parameters:params file:nil];
@@ -480,7 +480,7 @@ repeat:
             {
                 [RANetwork err_log:[RAUtils base64en:[RAConvertor dict2string:params]] result:[RAUtils base64en:[RAConvertor dict2string:ret]] module:url code:RESULT_NET_ERROR];
             }
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
             [ERPUtils googleAnalyticsSendRequestString:url WithScreen:screenName Action:userAction Extra:extra];
 #endif
             return jsonData;
@@ -547,7 +547,7 @@ repeat:
             NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsobj
                                                                options:0
                                                                  error:nil];
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
             [ERPUtils googleAnalyticsSendRequestString:url WithScreen:screenName Action:userAction Extra:extra];
 #endif
             return jsonData;

+ 0 - 6
RedAnt ERP Mobile/iSales-UWAVER/AppDelegate.m

@@ -554,13 +554,7 @@ void UncaughtExceptionHandler(NSException *exception) {
     NSString* build =[infoDict objectForKey:@"CFBundleVersion"];
     NSString* version =[infoDict objectForKey:@"CFBundleShortVersionString"];
     NSString *versionNum = @"";
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
     versionNum = [NSString stringWithFormat:@"Version: %@ %@ Build %@",COMPANY_SHORT_NAME,version,build];
-#endif
-    
-#ifdef BUILD_HMLG
-    versionNum = [NSString stringWithFormat:@"Version: HOMELEGANCE %@ Build %@",version,build];
-#endif
     
     versionNum = [versionNum stringByReplacingOccurrencesOfString:@"'" withString:@"''"];
     /**

+ 66 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,66 @@
+{
+  "images" : [
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "appicon-5.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "appicon-6.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "appicon-3.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "appicon-4.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "appicon-1.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "appicon-2.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "appicon.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "homelegance.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-1.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-2.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-3.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-4.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-5.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon-6.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/appicon.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/AppIcon.appiconset/homelegance.png


+ 6 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "DX_18.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "DX_18@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "DX_18@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/DX_18.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/DX_18@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_18.imageset/DX_18@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "DX_22.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "DX_22@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "DX_22@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/DX_22.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/DX_22@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/DX_22.imageset/DX_22@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "IS_18.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IS_18@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IS_18@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/IS_18.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/IS_18@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_18.imageset/IS_18@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "IS_22.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IS_22@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IS_22@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/IS_22.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/IS_22@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IS_22.imageset/IS_22@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "IX_18.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IX_18@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IX_18@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/IX_18.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/IX_18@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_18.imageset/IX_18@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "IX_22.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IX_22@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "IX_22@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/IX_22.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/IX_22@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/IX_22.imageset/IX_22@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "TS_18.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TS_18@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TS_18@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/TS_18.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/TS_18@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_18.imageset/TS_18@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "TS_22.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TS_22@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TS_22@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/TS_22.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/TS_22@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TS_22.imageset/TS_22@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "TX_18.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TX_18@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TX_18@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/TX_18.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/TX_18@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_18.imageset/TX_18@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "TX_22.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TX_22@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "TX_22@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/TX_22.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/TX_22@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/TX_22.imageset/TX_22@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/appicon-1.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/appicon-2.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/about.imageset/appicon.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/appicon-1.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/appicon-2.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_100.imageset/appicon.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "add(1).png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "add(1)@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "add(1)@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/add(1).png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/add(1)@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/add_180.imageset/add(1)@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/appicon-1.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/appicon-2.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/album.imageset/appicon.png


+ 21 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/appicon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/appicon.imageset/appicon.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/appicon-1.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/appicon-2.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/assign.imageset/appicon.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "back.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "back@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "back@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/back.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/back@2x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/back.imageset/back@3x.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/CAR.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/CAR248.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/CAR372.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtocart_large.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "CAR.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "CAR248.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "CAR372.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "portfolio124.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "portfolio248.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "portfolio372.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/portfolio124.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/portfolio248.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtoportfolio.imageset/portfolio372.png


+ 23 - 0
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "WISHLIST124.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "WISHLIST248.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "WISHLIST372.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/WISHLIST124.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/WISHLIST248.png


BIN
RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/btn_addtowish.imageset/WISHLIST372.png


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.