1.修改UWAVER界面显示Hang Tag。

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1714,12 +1714,22 @@
 //        [map setValue:@"rect_contact_list" forKey:@"img"];
 //        [self.sideMenuItems addObject:map.copy];
         
-        
+#ifdef BUILD_UWAVER
+        [map setValue:@"Hang Tag" forKey:@"title"];
+#else
         [map setValue:@"Portfolio" forKey:@"title"];
+#endif
+        
         [map setValue:@"rect_market_news" forKey:@"img"];
         [self.sideMenuItems addObject:map.copy];
         
+#ifdef BUILD_UWAVER
+        [map setValue:@"View Hang Tags" forKey:@"title"];
+#else
         [map setValue:@"View Portfolios" forKey:@"title"];
+#endif
+        
+        
         [map setValue:@"rect_pdf_list" forKey:@"img"];
         [self.sideMenuItems addObject:map.copy];
     }
@@ -2077,7 +2087,7 @@
     cell.detailTextLabel.textColor =[UIColor redColor];
     if([title isEqualToString:@"Wish List"]&&appDelegate.wish_count>0)
         cell.detailTextLabel.text = [NSString stringWithFormat:@"%ld",appDelegate.wish_count];
-    else if([title isEqualToString:@"Portfolio"]&&appDelegate.port_count>0)
+    else if(([title isEqualToString:@"Portfolio"] || [title isEqualToString:@"Hang Tag"])&&appDelegate.port_count>0)
         cell.detailTextLabel.text = [NSString stringWithFormat:@"%ld",appDelegate.port_count];
     else
     {
@@ -2527,14 +2537,14 @@
     
     
     
-    else if([title isEqualToString:@"Portfolio"])
+    else if([title isEqualToString:@"Portfolio"] || [title isEqualToString:@"Hang Tag"])
     {
         [self hideMenu];
         if([self.current_VC isKindOfClass:[PortfolioViewController class]])
             return;
         [self flipFromViewController:self.current_VC toViewController:self.portfolioViewController withDirection:UIViewAnimationOptionTransitionCrossDissolve];
     }
-    else if([title isEqualToString:@"View Portfolios"])
+    else if([title isEqualToString:@"View Portfolios"] || [title isEqualToString:@"View Hang Tags"])
     {
         [self hideMenu];
         if([self.current_VC isKindOfClass:[PDFListViewController class]])

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

@@ -91,7 +91,10 @@
     
     
     NSMutableDictionary* items =[[self.category_data objectForKey:@"items"] mutableCopy];
-    
+    if (items == nil) {
+        items = [NSMutableDictionary dictionary];
+        [items setObject:@(0) forKey:@"count"];
+    }
     int count = [[items valueForKey:@"count"] intValue];
     
     for(int i=0;i<count;i++)
@@ -1540,6 +1543,10 @@
 //    self.detailView.hidden = true;
     self.selectallBtn.possibleTitles = [NSSet setWithObjects:@"Selece", @"Deselect", nil];
     
+#ifdef BUILD_UWAVER
+    self.addPortfolioBtn.title = @"Add to Hang Tag";
+#endif
+    
     
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)
     self.categoryViewType = CATEGORY_VIEWTYPE_LARGE;

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

@@ -68,7 +68,11 @@
     {
         
         
+#ifdef BUILD_UWAVER
+        self.btnCreatePort.title = @"Create Hang Tag";
+#else
         [self.btnCreatePort setTitle:@"Create Portfolio"];
+#endif
         self.btnCreatePort.enabled = true;
     }
     else
@@ -365,7 +369,13 @@
     //     disable for debug
     if(checked.count==0)
     {
-        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Create Portfolio." controller:self] ;
+        NSString *title = @"Cannot Create Portfolio.";
+#ifdef BUILD_UWAVER
+        title = @"Cannot Create Hang Tag.";
+#else
+        title:@"Cannot Create Portfolio.";
+#endif
+        [RAUtils message_alert:@"You must select at least one model." title:title controller:self] ;
         return;
     }
     
@@ -501,6 +511,10 @@
     //            tap.minimumPressDuration = 0.8; //定义按的时间
     [self.label_net_err addGestureRecognizer:tap];
     
+#ifdef BUILD_UWAVER
+    self.btnCreatePort.title = @"Create Hang Tag";
+#endif
+    
     [self initCheckedCount];
 }
 
@@ -1740,8 +1754,12 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     if(appDelegate.can_create_portfolio)
     {
         
-        
+#ifdef BUILD_UWAVER
+        self.btnCreatePort.title = @"Create Hang Tag";
+#else
         [self.btnCreatePort setTitle:@"Create Portfolio"];
+#endif
+        
         self.btnCreatePort.enabled = true;
     }
     else
@@ -1817,7 +1835,11 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     {
         
         
+#ifdef BUILD_UWAVER
+        self.btnCreatePort.title = @"Create Hang Tag";
+#else
         [self.btnCreatePort setTitle:@"Create Portfolio"];
+#endif
         self.btnCreatePort.enabled = true;
     }
     else

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

@@ -99,6 +99,10 @@
     
     
     NSMutableDictionary* items =[[self.category_data objectForKey:@"items"] mutableCopy];
+    if (items == nil) {
+        items = [NSMutableDictionary dictionary];
+        [items setObject:@(0) forKey:@"count"];
+    }
     
     int count = [[items valueForKey:@"count"] intValue];
     
@@ -236,6 +240,11 @@
     //            tap.minimumPressDuration = 0.8; //定义按的时间
     [self.label_net_err addGestureRecognizer:tap];
     
+#ifdef BUILD_UWAVER
+    self.addPortfolioBtn.title = @"Add to Hang Tag";
+#endif
+    
+    
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)
     self.categoryViewType = CATEGORY_VIEWTYPE_LARGE;
 #else

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

@@ -231,6 +231,10 @@
     
     self.selectallBtn.possibleTitles = [NSSet setWithObjects:@"Select", @"Deselect", nil];
     
+#ifdef BUILD_UWAVER
+    self.addPortfolioBtn.title = @"Add to Hang Tag";
+#endif
+    
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)
     self.categoryViewType = CATEGORY_VIEWTYPE_LARGE;
 #else