iOS Team / ScioLive · Commits

Commit 7ca75e9fbf12a9f0a8ff88a1501b73495c25e225

Authored by yanglingyu
1 parent 83b902f3

rgba->argb运算修改

Inline Side-by-side
Showing 1 changed file with 8 additions and 9 deletions
CNLiveScioLive/Pages/Tools/ImageGray/UIColor+CNGray.m
  View file @7ca75e9
... ... @@ -34,8 +34,8 @@ static inline NSUInteger hexStrToInt(NSString *str) {
34 34 return result;
35 35 }
36 36  
37   -static BOOL hexStrToRGBA(NSString *str,
38   - CGFloat *r, CGFloat *g, CGFloat *b, CGFloat *a) {
  37 +static BOOL hexStrToARGB(NSString *str,
  38 + CGFloat *a, CGFloat *r, CGFloat *g, CGFloat *b) {
39 39  
40 40  
41 41 str = ({ // Trim blank characters (space and newline) in head and tail.
... ... @@ -64,19 +64,18 @@ static BOOL hexStrToRGBA(NSString *str,
64 64 if (length == 4) *a = hexStrToInt([str substringWithRange:NSMakeRange(3, 1)]) / 255.0f;
65 65 else *a = 1;
66 66 } else {
67   - *r = hexStrToInt([str substringWithRange:NSMakeRange(0, 2)]) / 255.0f;
68   - *g = hexStrToInt([str substringWithRange:NSMakeRange(2, 2)]) / 255.0f;
69   - *b = hexStrToInt([str substringWithRange:NSMakeRange(4, 2)]) / 255.0f;
70   - if (length == 8) *a = hexStrToInt([str substringWithRange:NSMakeRange(6, 2)]) / 255.0f;
71   - else *a = 1;
  67 + *a = hexStrToInt([str substringWithRange:NSMakeRange(0, 2)]) / 255.0f;
  68 + *r = hexStrToInt([str substringWithRange:NSMakeRange(2, 2)]) / 255.0f;
  69 + *g = hexStrToInt([str substringWithRange:NSMakeRange(4, 2)]) / 255.0f;
  70 + *b = hexStrToInt([str substringWithRange:NSMakeRange(6, 2)]) / 255.0f;
72 71 }
73 72 return YES;
74 73 }
75 74  
76 75 + (instancetype)colorWithHexString:(NSString *)hexStr {
77 76 CGFloat r, g, b, a;
78   - if (hexStrToRGBA(hexStr, &r, &g, &b, &a)) {
79   - return [UIColor colorWithRed:r green:g blue:b alpha:1];
  77 + if (hexStrToARGB(hexStr, &a, &r, &g, &b)) {
  78 + return [UIColor colorWithRed:r green:g blue:b alpha:a];
80 79 }
81 80 return nil;
82 81 }
... ...