Sfoglia il codice sorgente

1.修改UWAVER界面隐藏Edit Portfolio。

Pen Li 7 anni fa
parent
commit
8ee1e855ff

+ 1 - 0
RedAnt ERP Mobile/common/Functions/portfolio/PDFListViewController.h

@@ -23,5 +23,6 @@
 @property bool norefresh;
 
 @property (strong, nonatomic) IBOutlet UILabel *label_net_err;
+@property (nonatomic,strong) IBOutlet UINavigationItem *navItem;
 
 @end

+ 4 - 0
RedAnt ERP Mobile/common/Functions/portfolio/PDFListViewController.m

@@ -68,6 +68,10 @@
     //            tap.minimumPressDuration = 0.8; //定义按的时间
     [self.label_net_err addGestureRecognizer:tap];
     // Do any additional setup after loading the view.
+    
+#ifdef BUILD_UWAVER
+    self.navItem.title = @"View Hang Tags";
+#endif
 }
 
 - (void)didReceiveMemoryWarning {

+ 2 - 0
RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.h

@@ -23,4 +23,6 @@
 
 //@property (strong, nonatomic) IBOutlet UIToolbar *toolbar;
 @property (strong, nonatomic) IBOutlet UILabel *label_net_err;
+@property (nonatomic,strong) IBOutlet UIBarButtonItem *btnEdit;
+
 @end

+ 12 - 0
RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -515,6 +515,8 @@
     
 #ifdef BUILD_UWAVER
     self.btnCreatePort.title = @"Create Hang Tag";
+    self.btnEdit.title = nil;
+    self.btnEdit.enabled = NO;
 #endif
     
     [self initCheckedCount];
@@ -976,6 +978,9 @@
     unsigned long color = strtoul([value UTF8String],0,16);
     
     NSString *sectionTitle = @"Portfolio";
+#ifdef BUILD_UWAVER
+    sectionTitle = @"Hang Tag";
+#endif
     
     DefaultTableHeaderView* myView = [[DefaultTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, 33)];
     
@@ -1423,7 +1428,10 @@
         if(appDelegate.can_set_tearsheet_price)
         {
             //[arr addObject:editRowAction];
+            
+#ifndef BUILD_UWAVER
             [arr addObject:EditQTYAction];
+#endif
         }
         
         return arr;
@@ -1435,7 +1443,11 @@
         } else {
             
             if(appDelegate.can_set_tearsheet_price) {
+#ifndef BUILD_UWAVER
                 return @[deleteRowAction,EditQTYAction];
+#else
+                return @[deleteRowAction];
+#endif
             } else {
                 return @[deleteRowAction];
             }

+ 1 - 1
RedAnt ERP Mobile/common/Functions/sidemenu/AboutViewController.m

@@ -23,7 +23,7 @@
     
     // Do any additional setup after loading the view.
     
-    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"close"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"close"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                     style:UIBarButtonItemStylePlain
                                                                    target:self
                                                                    action:@selector( onCloseClick:)];