diff --git a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUBeautyView.m b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUBeautyView.m index 826ae4e8..8517e30e 100644 --- a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUBeautyView.m +++ b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUBeautyView.m @@ -58,9 +58,9 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection imageName = opened ? [modle.mTitle stringByAppendingString:@"-1.png"] : [modle.mTitle stringByAppendingString:@"-0.png"] ; } - cell.imageView.image = [UIImage imageWithName:imageName]; + cell.imageView.image = [UIImage fu_imageWithName:imageName]; cell.titleLabel.text = NSLocalizedString(modle.mTitle,nil); - cell.titleLabel.textColor = _selectedIndex == indexPath.row ? [UIColor colorWithHexColorString:@"5EC7FE"] : [UIColor whiteColor]; + cell.titleLabel.textColor = _selectedIndex == indexPath.row ? [UIColor fu_colorWithHexColorString:@"5EC7FE"] : [UIColor whiteColor]; } return cell ; } diff --git a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUFilterView.m b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUFilterView.m index b8f8ee57..a82aa4a4 100644 --- a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUFilterView.m +++ b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUFilterView.m @@ -60,7 +60,7 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection cell.titleLabel.text = NSLocalizedString(model.mTitle,nil); cell.titleLabel.textColor = [UIColor whiteColor]; - cell.imageView.image = [UIImage imageWithName:model.mParam]; + cell.imageView.image = [UIImage fu_imageWithName:model.mParam]; cell.imageView.layer.borderWidth = 0.0 ; cell.imageView.layer.borderColor = [UIColor clearColor].CGColor; @@ -68,8 +68,8 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection if (_selectedIndex == indexPath.row) { cell.imageView.layer.borderWidth = 2.0 ; - cell.imageView.layer.borderColor = [UIColor colorWithHexColorString:@"5EC7FE"].CGColor; - cell.titleLabel.textColor = [UIColor colorWithHexColorString:@"5EC7FE"]; + cell.imageView.layer.borderColor = [UIColor fu_colorWithHexColorString:@"5EC7FE"].CGColor; + cell.titleLabel.textColor = [UIColor fu_colorWithHexColorString:@"5EC7FE"]; } return cell ; diff --git a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUSlider.m b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUSlider.m index 0ecf0ee0..cb178867 100644 --- a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUSlider.m +++ b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/FUSlider.m @@ -24,9 +24,9 @@ - (void)awakeFromNib { [super awakeFromNib]; - [self setThumbImage:[UIImage imageWithName:@"expource_slider_dot"] forState:UIControlStateNormal]; + [self setThumbImage:[UIImage fu_imageWithName:@"expource_slider_dot"] forState:UIControlStateNormal]; - UIImage *bgImage = [UIImage imageWithName:@"slider_tip_bg"]; + UIImage *bgImage = [UIImage fu_imageWithName:@"slider_tip_bg"]; bgImgView = [[UIImageView alloc] initWithImage:bgImage]; bgImgView.frame = CGRectMake(0, -bgImage.size.height, bgImage.size.width, bgImage.size.height); [self addSubview:bgImgView]; @@ -45,9 +45,9 @@ - (void)awakeFromNib -(instancetype)initWithFrame:(CGRect)frame{ if (self = [super initWithFrame:frame]) { - [self setThumbImage:[UIImage imageWithName:@"expource_slider_dot"] forState:UIControlStateNormal]; + [self setThumbImage:[UIImage fu_imageWithName:@"expource_slider_dot"] forState:UIControlStateNormal]; - UIImage *bgImage = [UIImage imageWithName:@"slider_tip_bg"]; + UIImage *bgImage = [UIImage fu_imageWithName:@"slider_tip_bg"]; bgImgView = [[UIImageView alloc] initWithImage:bgImage]; bgImgView.frame = CGRectMake(0, -bgImage.size.height, bgImage.size.width, bgImage.size.height); [self addSubview:bgImgView]; @@ -72,7 +72,7 @@ -(void)layoutSubviews { if (!middleView) { middleView = [[UIView alloc] initWithFrame:CGRectMake(2, self.frame.size.height /2.0 - 1, 100, 4)]; - middleView.backgroundColor = [UIColor colorWithHexColorString:@"5EC7FE"]; + middleView.backgroundColor = [UIColor fu_colorWithHexColorString:@"5EC7FE"]; middleView.hidden = YES; [self insertSubview:middleView atIndex: self.subviews.count - 1]; } @@ -107,7 +107,7 @@ -(void)setType:(FUSliderType)type { line.hidden = YES ; middleView.hidden = YES ; - [self setMinimumTrackTintColor:[UIColor colorWithHexColorString:@"5EC7FE"]]; + [self setMinimumTrackTintColor:[UIColor fu_colorWithHexColorString:@"5EC7FE"]]; } break; } diff --git a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.h b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.h index cb6e4e25..35629102 100644 --- a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.h +++ b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.h @@ -13,10 +13,10 @@ /** * 十六进制颜色 */ -+ (UIColor *)colorWithHexColorString:(NSString *)hexColorString; ++ (UIColor *)fu_colorWithHexColorString:(NSString *)hexColorString; /** * 十六进制颜色:含alpha */ -+ (UIColor *)colorWithHexColorString:(NSString *)hexColorString alpha:(float)alpha; ++ (UIColor *)fu_colorWithHexColorString:(NSString *)hexColorString alpha:(float)alpha; @end diff --git a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.m b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.m index d461e6bf..41e7d2f6 100644 --- a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.m +++ b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIColor+FUAPIDemoBar.m @@ -11,12 +11,12 @@ @implementation UIColor (FUAPIDemoBar) #pragma mark 十六进制颜色 -+ (UIColor *)colorWithHexColorString:(NSString *)hexColorString{ - return [self colorWithHexColorString:hexColorString alpha:1.0f]; ++ (UIColor *)fu_colorWithHexColorString:(NSString *)hexColorString{ + return [self fu_colorWithHexColorString:hexColorString alpha:1.0f]; } #pragma mark 十六进制颜色 -+ (UIColor *)colorWithHexColorString:(NSString *)hexColorString alpha:(float)alpha{ ++ (UIColor *)fu_colorWithHexColorString:(NSString *)hexColorString alpha:(float)alpha{ unsigned int red, green, blue; diff --git a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.h b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.h index 8a2fdde0..7a9f04a4 100644 --- a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.h +++ b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.h @@ -10,5 +10,5 @@ @interface UIImage (demobar) -+ (UIImage *)imageWithName:(NSString *)name; ++ (UIImage *)fu_imageWithName:(NSString *)name; @end diff --git a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.m b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.m index 5f8d9da6..a091c412 100644 --- a/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.m +++ b/FULiveDemo/Modules/Beauty/FUAPIDemoBar/UIImage+demobar.m @@ -11,7 +11,7 @@ @implementation UIImage (demobar) -+ (UIImage *)imageWithName:(NSString *)name { ++ (UIImage *)fu_imageWithName:(NSString *)name { UIImage *image = [UIImage imageNamed:name inBundle:[NSBundle bundleForClass:FUAPIDemoBar.class] compatibleWithTraitCollection:nil]; if (image == nil) { image = [UIImage imageNamed:name];