rgba->argb运算修改

yanglingyu
1 parent 83b902f3
Showing 1 changed file with 8 additions and 9 deletions
CNLiveScioLive/Pages/Tools/ImageGray/UIColor+CNGray.m
@@ -34,8 +34,8 @@ static inline NSUInteger hexStrToInt(NSString *str) {
     return result;
 }
-static BOOL hexStrToRGBA(NSString *str,
-                         CGFloat *r, CGFloat *g, CGFloat *b, CGFloat *a) {
+static BOOL hexStrToARGB(NSString *str,
+                         CGFloat *a, CGFloat *r, CGFloat *g, CGFloat *b) {
     str = ({ // Trim blank characters (space and newline) in head and tail.
@@ -64,19 +64,18 @@ static BOOL hexStrToRGBA(NSString *str,
         if (length == 4)  *a = hexStrToInt([str substringWithRange:NSMakeRange(3, 1)]) / 255.0f;
         else *a = 1;
     } else {
-        *r = hexStrToInt([str substringWithRange:NSMakeRange(0, 2)]) / 255.0f;
-        *g = hexStrToInt([str substringWithRange:NSMakeRange(2, 2)]) / 255.0f;
-        *b = hexStrToInt([str substringWithRange:NSMakeRange(4, 2)]) / 255.0f;
-        if (length == 8) *a = hexStrToInt([str substringWithRange:NSMakeRange(6, 2)]) / 255.0f;
-        else *a = 1;
+        *a = hexStrToInt([str substringWithRange:NSMakeRange(0, 2)]) / 255.0f;
+        *r = hexStrToInt([str substringWithRange:NSMakeRange(2, 2)]) / 255.0f;
+        *g = hexStrToInt([str substringWithRange:NSMakeRange(4, 2)]) / 255.0f;
+        *b = hexStrToInt([str substringWithRange:NSMakeRange(6, 2)]) / 255.0f;
     }
     return YES;
 }
 + (instancetype)colorWithHexString:(NSString *)hexStr {
     CGFloat r, g, b, a;
-    if (hexStrToRGBA(hexStr, &r, &g, &b, &a)) {
-        return [UIColor colorWithRed:r green:g blue:b alpha:1];
+    if (hexStrToARGB(hexStr, &a, &r, &g, &b)) {
+        return [UIColor colorWithRed:r green:g blue:b alpha:a];
     }
     return nil;
 }