Commit 1c6bde133cef92d43ee38dc60f87ede8f95ffd48
1 parent
05c8ca3d
颜色设置,环境配置
Showing
2 changed files
with
3 additions
and
6 deletions
CNLiveScioLive/Pages/Header/UrlMacro.h
| @@ -9,11 +9,8 @@ | @@ -9,11 +9,8 @@ | ||
| 9 | #ifndef UrlMacro_h | 9 | #ifndef UrlMacro_h |
| 10 | #define UrlMacro_h | 10 | #define UrlMacro_h |
| 11 | 11 | ||
| 12 | -#ifdef DEBUG | ||
| 13 | -#define REQUESTURL(url) [@"http://test.app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url] | ||
| 14 | -#else | ||
| 15 | -#define REQUESTURL(url) [@"http://app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url] | ||
| 16 | -#endif | 12 | +#define REQUESTURL(url) [@"http://test.app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url] //测试环境 |
| 13 | +//#define REQUESTURL(url) [@"http://app.phonemovie.cnlive.com/" stringByAppendingPathComponent:url] //正式环境 | ||
| 17 | 14 | ||
| 18 | #define IS_STRING_EMPTY(string) (string==nil || string == NULL || [string isKindOfClass:[NSNull class]] || [[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0 || [string isEqualToString:@""] || [string isEqualToString:@"<null>"]) | 15 | #define IS_STRING_EMPTY(string) (string==nil || string == NULL || [string isKindOfClass:[NSNull class]] || [[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0 || [string isEqualToString:@""] || [string isEqualToString:@"<null>"]) |
| 19 | 16 |
CNLiveScioLive/Pages/Tools/ImageGray/UIColor+CNGray.m
| @@ -76,7 +76,7 @@ static BOOL hexStrToRGBA(NSString *str, | @@ -76,7 +76,7 @@ static BOOL hexStrToRGBA(NSString *str, | ||
| 76 | + (instancetype)colorWithHexString:(NSString *)hexStr { | 76 | + (instancetype)colorWithHexString:(NSString *)hexStr { |
| 77 | CGFloat r, g, b, a; | 77 | CGFloat r, g, b, a; |
| 78 | if (hexStrToRGBA(hexStr, &r, &g, &b, &a)) { | 78 | if (hexStrToRGBA(hexStr, &r, &g, &b, &a)) { |
| 79 | - return [UIColor colorWithRed:r green:g blue:b alpha:a]; | 79 | + return [UIColor colorWithRed:r green:g blue:b alpha:1]; |
| 80 | } | 80 | } |
| 81 | return nil; | 81 | return nil; |
| 82 | } | 82 | } |