Эх сурвалжийг харах

修改progessHUD背景颜色0xA5A5A5 alpha:0.5

Pen Li 9 жил өмнө
parent
commit
cfeb6f9dc4

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


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

@@ -31,6 +31,8 @@
 
 #import "MainViewController.h"
 //#import "ScannerViewController.h"
+#import "UIColor+JK_HEX.h"
+
 #define  DEF_CELL_HEIGHT 44
 #define  DEF_TABLE_HEIGHT 44
 #define  LINE_WIDTH 0
@@ -1251,7 +1253,9 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithRed:0.2 green:0.2 blue:0.2 alpha:0.5];
+    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
+    self.mum.layer.cornerRadius = 5.0f;
+    self.mum.layer.masksToBounds = YES;
     
     
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(refresh_btn_click:)];

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

@@ -56,7 +56,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0x5C77A1];
+    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     

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

@@ -206,7 +206,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0x5C77A1];
+    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
 

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

@@ -144,7 +144,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0x5C77A1];
+    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
 

+ 1 - 1
RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -416,7 +416,7 @@
     CGPoint center = self.mum.center;
     self.mum.frame = CGRectMake(0, 0, 100, 100);
     self.mum.center = center;
-    self.mum.backgroundColor = [UIColor colorWithHEX:0xF2E5F2];
+    self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     

+ 2 - 0
RedAnt ERP Mobile/iSales-NPD/UIColor+HEX/UIColor+JK_HEX.h

@@ -12,6 +12,8 @@
 
 + (instancetype)colorWithHEX:(NSInteger)hex;
 
++ (instancetype)colorWithHEX:(NSInteger)hex alpha:(CGFloat)alpha;
+
 + (instancetype)colorWithHEXString:(NSString *)hexString;
 
 @end

+ 7 - 0
RedAnt ERP Mobile/iSales-NPD/UIColor+HEX/UIColor+JK_HEX.m

@@ -14,6 +14,13 @@
     return [UIColor colorWithRed:((hex & 0xff0000) >> 16) / 255.0 green:((hex & 0xff00) >> 8) / 255.0 blue:(hex & 0xff) / 255.0 alpha:1];
 }
 
++ (instancetype)colorWithHEX:(NSInteger)hex alpha:(CGFloat)alpha {
+    if (alpha > 1) {
+        alpha = 1 / alpha;
+    }
+    return [UIColor colorWithRed:((hex & 0xff0000) >> 16) / 255.0 green:((hex & 0xff00) >> 8) / 255.0 blue:(hex & 0xff) / 255.0 alpha:alpha];
+}
+
 + (instancetype)colorWithHEXString:(NSString *)hexString{
     if ([hexString hasPrefix:@"#"]) {
         hexString = [hexString stringByReplacingOccurrencesOfString:@"#" withString:@"0x"];