Commit 6d728a96 by ludi

完成首页一级页面ui

parent 0156e1c4
Showing with 708 additions and 62 deletions
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
- (void)setWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder - (void)setWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder
{ {
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
[self setImage:UIImage.fus_defaultIcon forState:UIControlStateNormal]; [self setImage:UIImage.themeFontIcon forState:UIControlStateNormal];
return; return;
} }
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
- (void)setWebImageWithSubURLString:(NSString *)urlString controlState:(UIControlState)state placeholder:(UIImage *)placeholder - (void)setWebImageWithSubURLString:(NSString *)urlString controlState:(UIControlState)state placeholder:(UIImage *)placeholder
{ {
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
[self setImage:UIImage.fus_defaultIcon forState:UIControlStateNormal]; [self setImage:UIImage.themeFontIcon forState:UIControlStateNormal];
return; return;
} }
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
{ {
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
[self setBackgroundImage:UIImage.fus_defaultIcon forState:UIControlStateNormal]; [self setBackgroundImage:UIImage.themeFontIcon forState:UIControlStateNormal];
return; return;
} }
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
url = [NSURL URLWithString:[FUSConfig.sharedInstanced.pathConfigs downloadPath:urlString]]; url = [NSURL URLWithString:[FUSConfig.sharedInstanced.pathConfigs downloadPath:urlString]];
} }
[self setBackgroundImageWithURL:url forState:state options:placeholder]; [self setBackgroundImageWithURL:url forState:state placeholder:placeholder];
} }
@end @end
...@@ -30,7 +30,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -30,7 +30,7 @@ static dispatch_queue_t get_image_clip_queue(){
- (void)setBaoFangCoverWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder - (void)setBaoFangCoverWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder
{ {
if (placeholder == nil) { if (placeholder == nil) {
placeholder = UIImage.fus_defaultIcon; placeholder = UIImage.themeFontIcon;
} }
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
self.image = [UIImage fus_ImageNamed:@"home_list_default_cover"]; self.image = [UIImage fus_ImageNamed:@"home_list_default_cover"];
...@@ -54,7 +54,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -54,7 +54,7 @@ static dispatch_queue_t get_image_clip_queue(){
{ {
// [self sd_setImageWithURL:[NSString isNull:urlString] ? nil : [NSURL URLWithString:[DOWNURL stringByAppendingPathComponent:urlString]] placeholderImage:placeholder completed:completion]; // [self sd_setImageWithURL:[NSString isNull:urlString] ? nil : [NSURL URLWithString:[DOWNURL stringByAppendingPathComponent:urlString]] placeholderImage:placeholder completed:completion];
if (placeholder == nil) { if (placeholder == nil) {
placeholder = UIImage.fus_defaultIcon; placeholder = UIImage.themeFontIcon;
} }
if ([urlString containsString:@"boy"] if ([urlString containsString:@"boy"]
...@@ -114,7 +114,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -114,7 +114,7 @@ static dispatch_queue_t get_image_clip_queue(){
- (void)setLiveWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder completion:(YYWebImageCompletionBlock)completion - (void)setLiveWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder completion:(YYWebImageCompletionBlock)completion
{ {
if (placeholder == nil) { if (placeholder == nil) {
placeholder = UIImage.fus_defaultIcon; placeholder = UIImage.themeFontIcon;
} }
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
...@@ -145,10 +145,10 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -145,10 +145,10 @@ static dispatch_queue_t get_image_clip_queue(){
- (void)setWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder - (void)setWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder
{ {
if (placeholder == nil) { if (placeholder == nil) {
placeholder = UIImage.fus_defaultIcon; placeholder = UIImage.themeFontIcon;
} }
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
self.image = UIImage.fus_defaultIcon; self.image = UIImage.themeFontIcon;
return; return;
} }
...@@ -174,11 +174,11 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -174,11 +174,11 @@ static dispatch_queue_t get_image_clip_queue(){
- (void)setWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder options:(YYWebImageOptions)options - (void)setWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder options:(YYWebImageOptions)options
{ {
if (placeholder == nil) { if (placeholder == nil) {
placeholder = UIImage.fus_defaultIcon; placeholder = UIImage.themeFontIcon;
} }
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
self.image = UIImage.fus_defaultIcon; self.image = UIImage.themeFontIcon;
return; return;
} }
...@@ -195,15 +195,15 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -195,15 +195,15 @@ static dispatch_queue_t get_image_clip_queue(){
{ {
// [self sd_setImageWithURL:[NSString isNull:urlString] ? nil : [NSURL URLWithString:[DOWNURL stringByAppendingPathComponent:urlString]] placeholderImage:placeholder completed:completion]; // [self sd_setImageWithURL:[NSString isNull:urlString] ? nil : [NSURL URLWithString:[DOWNURL stringByAppendingPathComponent:urlString]] placeholderImage:placeholder completed:completion];
if (placeholder == nil) { if (placeholder == nil) {
placeholder = UIImage.fus_defaultIcon; placeholder = UIImage.themeFontIcon;
} }
if ([urlString containsString:@"boy"] if ([urlString containsString:@"boy"]
|| [urlString containsString:@"girl"]) { || [urlString containsString:@"girl"]) {
[self cancelCurrentImageRequest]; [self cancelCurrentImageRequest];
self.image = UIImage.fus_defaultIcon; self.image = UIImage.themeFontIcon;
if (completion) { if (completion) {
completion(UIImage.fus_defaultIcon, completion(UIImage.themeFontIcon,
[NSURL URLWithString:urlString], [NSURL URLWithString:urlString],
YYWebImageFromMemoryCacheFast, YYWebImageFromMemoryCacheFast,
YYWebImageStageFinished, YYWebImageStageFinished,
...@@ -233,7 +233,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -233,7 +233,7 @@ static dispatch_queue_t get_image_clip_queue(){
[self setImageWithURL:[NSString isNull:urlString] ? nil : [NSURL URLWithString:[FUSConfig.sharedInstanced.pathConfigs downloadPath:urlString]] placeholder:placeholder options:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) { [self setImageWithURL:[NSString isNull:urlString] ? nil : [NSURL URLWithString:[FUSConfig.sharedInstanced.pathConfigs downloadPath:urlString]] placeholder:placeholder options:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
image = UIImage.fus_defaultIcon; image = UIImage.themeFontIcon;
UIImage *resizeImg = [image resizedImageToSize:CGSizeMake(500, 500)]; UIImage *resizeImg = [image resizedImageToSize:CGSizeMake(500, 500)];
self.image = [resizeImg applyBlurWithRadius:20 tintColor:[UIColor clearColor] saturationDeltaFactor:1 maskImage:nil atFrame:CGRectMake(0, 0, 512, 512)]; self.image = [resizeImg applyBlurWithRadius:20 tintColor:[UIColor clearColor] saturationDeltaFactor:1 maskImage:nil atFrame:CGRectMake(0, 0, 512, 512)];
return; return;
...@@ -256,7 +256,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -256,7 +256,7 @@ static dispatch_queue_t get_image_clip_queue(){
- (void)setSingleChatWebImageWithSubURLString:(NSString *)urlString completion:(YYWebImageCompletionBlock)completion - (void)setSingleChatWebImageWithSubURLString:(NSString *)urlString completion:(YYWebImageCompletionBlock)completion
{ {
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
self.image = UIImage.fus_defaultIcon; self.image = UIImage.themeFontIcon;
return; return;
} }
...@@ -273,7 +273,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -273,7 +273,7 @@ static dispatch_queue_t get_image_clip_queue(){
- (void)setChatWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder completion:(YYWebImageCompletionBlock)completion - (void)setChatWebImageWithSubURLString:(NSString *)urlString placeholder:(UIImage *)placeholder completion:(YYWebImageCompletionBlock)completion
{ {
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
self.image = UIImage.fus_defaultIcon; self.image = UIImage.themeFontIcon;
return; return;
} }
...@@ -304,7 +304,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -304,7 +304,7 @@ static dispatch_queue_t get_image_clip_queue(){
UIImage *cacheImage = [[YYImageCache sharedCache] getImageForKey:cacheUrlStr]; UIImage *cacheImage = [[YYImageCache sharedCache] getImageForKey:cacheUrlStr];
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
cacheImage = UIImage.fus_defaultIcon; cacheImage = UIImage.themeFontIcon;
} }
//链接以LocalimageUrl开头的默认为本地图片 //链接以LocalimageUrl开头的默认为本地图片
...@@ -323,7 +323,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -323,7 +323,7 @@ static dispatch_queue_t get_image_clip_queue(){
if (!error) { if (!error) {
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
image = UIImage.fus_defaultIcon; image = UIImage.themeFontIcon;
} }
UIImage *radiusImage = [image imageWithRoundedCornersAndSize:size andCornerRadius:radius withContentMode:UIViewContentModeScaleAspectFill]; UIImage *radiusImage = [image imageWithRoundedCornersAndSize:size andCornerRadius:radius withContentMode:UIViewContentModeScaleAspectFill];
...@@ -341,7 +341,7 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -341,7 +341,7 @@ static dispatch_queue_t get_image_clip_queue(){
//不需要圆角 //不需要圆角
else{ else{
if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) { if ([urlString containsString:@"boy"] || [urlString containsString:@"girl"]) {
self.image = UIImage.fus_defaultIcon; self.image = UIImage.themeFontIcon;
return; return;
} }
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
+ (NSString *)fus_defaultFileName:(NSString *)fileName; + (NSString *)themeFontFileName:(NSString *)fileName;
@end @end
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
} }
+ (NSString *)fus_defaultFileName:(NSString *)fileName { + (NSString *)themeFontFileName:(NSString *)fileName {
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDirectory = [paths objectAtIndex:0]; NSString *documentsDirectory = [paths objectAtIndex:0];
NSString *voiceDirectory = [documentsDirectory stringByAppendingPathComponent:@"voice"]; NSString *voiceDirectory = [documentsDirectory stringByAppendingPathComponent:@"voice"];
......
...@@ -81,6 +81,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -81,6 +81,10 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSString *)localString:(NSString *)key; + (NSString *)localString:(NSString *)key;
+ (NSString *(^)(NSString *key))versionLocalString;
+(NSString *)versionLocalString:(NSString *)key;
+ (UIImage *)fus_languageImage:(NSString *)name; + (UIImage *)fus_languageImage:(NSString *)name;
+ (NSString *)fus_languageImageName:(NSString *)name; + (NSString *)fus_languageImageName:(NSString *)name;
......
...@@ -235,6 +235,10 @@ static NSString *const FUSArbicLangArea = @"1001"; ...@@ -235,6 +235,10 @@ static NSString *const FUSArbicLangArea = @"1001";
return self.localString(key); return self.localString(key);
} }
+ (NSString *)versionLocalString:(NSString *)key{
return self.localString(key);
}
+ (NSString *(^)(NSString *key))localString { + (NSString *(^)(NSString *key))localString {
return ^NSString *(NSString *key) { return ^NSString *(NSString *key) {
NSString *tableName = [[NSUserDefaults standardUserDefaults] objectForKey:LANGUAGE_CORE_KEY]; NSString *tableName = [[NSUserDefaults standardUserDefaults] objectForKey:LANGUAGE_CORE_KEY];
...@@ -243,6 +247,14 @@ static NSString *const FUSArbicLangArea = @"1001"; ...@@ -243,6 +247,14 @@ static NSString *const FUSArbicLangArea = @"1001";
};; };;
} }
+ (NSString * _Nonnull (^)(NSString * _Nonnull))versionLocalString{
return ^NSString *(NSString *key) {
NSString *tableName = [[NSUserDefaults standardUserDefaults] objectForKey:LANGUAGE_CORE_KEY];
NSString *localString = [[NSBundle mainBundle] localizedStringForKey:key value:@"" table:tableName];
return localString;
};;
}
+ (NSString *(^)(NSString *key))foundationLocalString { + (NSString *(^)(NSString *key))foundationLocalString {
return ^NSString *(NSString *key) { return ^NSString *(NSString *key) {
NSString *tableName = [[NSUserDefaults standardUserDefaults] objectForKey:LANGUAGE_CORE_KEY]; NSString *tableName = [[NSUserDefaults standardUserDefaults] objectForKey:LANGUAGE_CORE_KEY];
......
...@@ -547,7 +547,7 @@ ...@@ -547,7 +547,7 @@
} }
- (void)btnHighlight:(UIButton *)sender { - (void)btnHighlight:(UIButton *)sender {
sender.backgroundColor = UIColor.appBGPressColor; sender.backgroundColor = UIColor.fus_appBGPressColor;
} }
- (void)btnCancelHighLight:(UIButton *)sender { - (void)btnCancelHighLight:(UIButton *)sender {
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
// 设置默认视图底色 // 设置默认视图底色
self.view.backgroundColor = UIColor.appBGColor; self.view.backgroundColor = UIColor.fus_appBGColor;
// 初始化导航栏 // 初始化导航栏
[self initBaseNavigation]; [self initBaseNavigation];
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
if (@available(iOS 15.0, *)) { if (@available(iOS 15.0, *)) {
UINavigationBarAppearance *barApp = [UINavigationBarAppearance new]; UINavigationBarAppearance *barApp = [UINavigationBarAppearance new];
barApp.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor colorWithHex:@"#E3E3E3"]}; barApp.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor colorWithHex:@"#E3E3E3"]};
barApp.backgroundColor = UIColor.navBarColor;; // 设置为你项目中的颜色 barApp.backgroundColor = UIColor.fus_navBarColor;; // 设置为你项目中的颜色
self.navigationController.navigationBar.scrollEdgeAppearance = barApp; // 可滑动界面配置 self.navigationController.navigationBar.scrollEdgeAppearance = barApp; // 可滑动界面配置
self.navigationController.navigationBar.standardAppearance = barApp; // 普通页面配置 self.navigationController.navigationBar.standardAppearance = barApp; // 普通页面配置
} else { } else {
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
[self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#E3E3E3"],NSFontAttributeName:[UIFont themeFont:18]}]; [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#E3E3E3"],NSFontAttributeName:[UIFont themeFont:18]}];
// 设置导航栏颜色 // 设置导航栏颜色
self.navigationController.navigationBar.barTintColor = UIColor.navBarColor; self.navigationController.navigationBar.barTintColor = UIColor.fus_navBarColor;
} }
} }
...@@ -340,6 +340,13 @@ ...@@ -340,6 +340,13 @@
return YES; return YES;
} }
- (void)fus_showLoadingView{
}
-(void)fus_hideLoadingView{
}
- (void)dealloc - (void)dealloc
{ {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
- (instancetype)initWithFrame:(CGRect)frame{ - (instancetype)initWithFrame:(CGRect)frame{
self = [super initWithFrame:frame]; self = [super initWithFrame:frame];
if (self) { if (self) {
self.backgroundColor = UIColor.appBGColor; self.backgroundColor = UIColor.fus_appBGColor;
self.frame = frame; self.frame = frame;
[self initUI]; [self initUI];
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
FUSProgressView *progressView = [[FUSProgressView alloc] initWithFrame:CGRectMake(10, 10, _bgView.width - 20, _bgView.width - 20)]; FUSProgressView *progressView = [[FUSProgressView alloc] initWithFrame:CGRectMake(10, 10, _bgView.width - 20, _bgView.width - 20)];
[_bgView addSubview:progressView]; [_bgView addSubview:progressView];
progressView.progressWidth = 5; progressView.progressWidth = 5;
progressView.bgColor = UIColor.appBGColor; progressView.bgColor = UIColor.fus_appBGColor;
progressView.progressColor = [UIColor colorWithHex:@"#00F088" alpha:1]; progressView.progressColor = [UIColor colorWithHex:@"#00F088" alpha:1];
// progressView.progerssLayer.shadowColor = [[UIColor colorWithHex:@"B5FFDF"] CGColor]; // progressView.progerssLayer.shadowColor = [[UIColor colorWithHex:@"B5FFDF"] CGColor];
// progressView.progerssLayer.shadowRadius = 3; // progressView.progerssLayer.shadowRadius = 3;
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
CAShapeLayer *layer = [CAShapeLayer layer]; CAShapeLayer *layer = [CAShapeLayer layer];
layer.path = [path CGPath]; layer.path = [path CGPath];
layer.fillColor = [[UIColor.appMainColor colorWithAlphaComponent:alpha] CGColor]; layer.fillColor = [[UIColor.fus_appMainColor colorWithAlphaComponent:alpha] CGColor];
layer.position = CGPointMake(lastWidth, (self.frame.size.height - realWidth) / 2.0); layer.position = CGPointMake(lastWidth, (self.frame.size.height - realWidth) / 2.0);
layer.anchorPoint = CGPointMake(0.5, 0.5); layer.anchorPoint = CGPointMake(0.5, 0.5);
layer.frame = CGRectMake(lastWidth, (self.frame.size.height - realWidth) / 2., realWidth, realWidth); layer.frame = CGRectMake(lastWidth, (self.frame.size.height - realWidth) / 2., realWidth, realWidth);
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
CAShapeLayer *layer = [CAShapeLayer layer]; CAShapeLayer *layer = [CAShapeLayer layer];
layer.path = [path CGPath]; layer.path = [path CGPath];
layer.fillColor = [[UIColor.appMainColor colorWithAlphaComponent:alpha] CGColor]; layer.fillColor = [[UIColor.fus_appMainColor colorWithAlphaComponent:alpha] CGColor];
layer.position = CGPointMake(lastWidth, (self.frame.size.height - realWidth) / 2.0); layer.position = CGPointMake(lastWidth, (self.frame.size.height - realWidth) / 2.0);
layer.anchorPoint = CGPointMake(0.5, 0.5); layer.anchorPoint = CGPointMake(0.5, 0.5);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
- (void)initProperties { - (void)initProperties {
self.backgroundColor = UIColor.appBGPressColor; self.backgroundColor = UIColor.fus_appBGPressColor;
self.separatorStyle = UITableViewCellSeparatorStyleNone; self.separatorStyle = UITableViewCellSeparatorStyleNone;
self.bounces = NO; self.bounces = NO;
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
_scrollView.scrollsToTop = NO; _scrollView.scrollsToTop = NO;
_scrollView.bounces = NO; _scrollView.bounces = NO;
_scrollView.pagingEnabled = YES; _scrollView.pagingEnabled = YES;
self.backgroundColor = UIColor.appBGColor; self.backgroundColor = UIColor.fus_appBGColor;
[self addSubview:_scrollView]; [self addSubview:_scrollView];
} }
......
...@@ -141,7 +141,7 @@ typedef enum :NSInteger{ ...@@ -141,7 +141,7 @@ typedef enum :NSInteger{
//选中的下划线 //选中的下划线
_underLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 4)]; _underLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 4)];
_underLine.backgroundColor = UIColor.appBGColor; _underLine.backgroundColor = UIColor.fus_appBGColor;
_underLine.hidden = NO; //默认隐藏 _underLine.hidden = NO; //默认隐藏
_underLine.layer.cornerRadius = _underLine.height/2.0; _underLine.layer.cornerRadius = _underLine.height/2.0;
_underLine.clipsToBounds = YES; _underLine.clipsToBounds = YES;
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
} }
self.progresslayer.frame = frame; self.progresslayer.frame = frame;
self.progresslayer.backgroundColor = [UIColor appMainColor].CGColor; self.progresslayer.backgroundColor = [UIColor fus_appMainColor].CGColor;
[self.layer addSublayer:self.progresslayer]; [self.layer addSublayer:self.progresslayer];
[self.wkWebView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil]; [self.wkWebView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
[self.wkWebView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:NULL]; [self.wkWebView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:NULL];
......
...@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
+ (UIImage *)fus_backImage; + (UIImage *)fus_backImage;
/// 默认头像 /// 默认头像
+ (UIImage *)fus_defaultIcon; + (UIImage *)themeFontIcon;
/// 性别男图标 /// 性别男图标
+ (UIImage *)fus_boyIcon; + (UIImage *)fus_boyIcon;
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
return [self fus_ImageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]]; return [self fus_ImageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
} }
+ (UIImage *)fus_defaultIcon { + (UIImage *)themeFontIcon {
return [self fus_ImageNamed:@"icon_boy_default"]; return [self fus_ImageNamed:@"icon_boy_default"];
} }
......
...@@ -10,22 +10,39 @@ ...@@ -10,22 +10,39 @@
@interface UIColor (FUSTheme) @interface UIColor (FUSTheme)
+ (UIColor *)appBGColor; + (UIColor *)fus_appBGColor;
+ (UIColor *)appBGPressColor; + (UIColor *)fus_appBGPressColor;
+ (UIColor *)navBarColor; + (UIColor *)fus_navBarColor;
+ (UIColor *)searchColor; + (UIColor *)fus_searchColor;
+ (UIColor *)listBGColor; + (UIColor *)fus_listBGColor;
+ (UIColor *)listBGPressColor; + (UIColor *)fus_listBGPressColor;
+ (UIColor *)fus_lineColor; + (UIColor *)fus_lineColor;
+ (UIColor *)appMainColor; + (UIColor *)fus_appMainColor;
+ (UIColor *)appSubColor; + (UIColor *)fus_appSubColor;
+ (UIColor *)diamondColor; /// 主题蓝色
+ (UIColor *)fireColor; +(UIColor *)fus_diamondBlue;
+ (UIColor *)dewColor; /// 泪水蓝
+(UIColor *)fus_dewBlue;
/// 火绿
+(UIColor *)fus_fireGreen;
/// 黑色字体 000000
+(UIColor *)fus_textColorDeep;
/// 黑色字体 222222
+(UIColor *)fus_textColorRich;
/// 灰色字体 666666
+(UIColor *)fus_textColorMedium;
/// 黑色字体 808080
+(UIColor *)fus_textColorLight;
/// 通用字体颜色,反色 fffff
+(UIColor *)fus_textColorVeryLight;
/// 弹窗背景颜色
+(UIColor *)fus_alertViewBackgroundColor;
@end @end
...@@ -11,23 +11,23 @@ ...@@ -11,23 +11,23 @@
@implementation UIColor (FUSTheme) @implementation UIColor (FUSTheme)
+ (UIColor *)appBGColor { + (UIColor *)fus_appBGColor {
return [UIColor whiteColor]; return [UIColor whiteColor];
} }
+ (UIColor *)appBGPressColor { + (UIColor *)fus_appBGPressColor {
return [UIColor colorWithHex:@"#EEEEEE"]; return [UIColor colorWithHex:@"#EEEEEE"];
} }
+ (UIColor *)navBarColor { + (UIColor *)fus_navBarColor {
return [UIColor whiteColor]; return [UIColor whiteColor];
} }
+ (UIColor *)listBGColor { + (UIColor *)fus_listBGColor {
return [UIColor whiteColor]; return [UIColor whiteColor];
} }
+ (UIColor *)listBGPressColor { + (UIColor *)fus_listBGPressColor {
return [UIColor colorWithHex:@"#EEEEEE"]; return [UIColor colorWithHex:@"#EEEEEE"];
} }
...@@ -35,29 +35,49 @@ ...@@ -35,29 +35,49 @@
return [UIColor colorWithHex:@"#dddddd"]; return [UIColor colorWithHex:@"#dddddd"];
} }
+ (UIColor *)appMainColor { + (UIColor *)fus_appMainColor {
return [UIColor colorWithHex:@"#00f088"]; return [UIColor colorWithHex:@"#00f088"];
} }
+ (UIColor *)appSubColor { + (UIColor *)fus_appSubColor {
return [UIColor colorWithHex:@"#18D9C4"]; return [UIColor colorWithHex:@"#18D9C4"];
} }
+ (UIColor *)searchColor { + (UIColor *)fus_searchColor {
return [UIColor colorWithHex:@"#24242E"]; return [UIColor colorWithHex:@"#24242E"];
} }
+ (UIColor *)diamondColor {
return [UIColor colorWithHex:@"#18D9C4"]; +(UIColor *)fus_diamondBlue{
return [UIColor colorWithHex:@"#01D9E0"];
} }
+ (UIColor *)fireColor { + (UIColor *)fus_dewBlue{
return [UIColor colorWithHex:@"#18D9C4"]; return [UIColor colorWithHex:@"#00A0E9"];
} }
+ (UIColor *)dewColor { + (UIColor *)fus_fireGreen{
return [UIColor colorWithHex:@"#18D9C4"]; return [UIColor colorWithHex:@"#00BE6B"];
} }
+ (UIColor *)fus_textColorMedium{
return [UIColor colorWithHex:@"#666666"];
}
+ (UIColor *)fus_textColorDeep{
return [UIColor colorWithHex:@"#000000"];
}
+ (UIColor *)fus_textColorRich{
return [UIColor colorWithHex:@"#222222"];
}
+ (UIColor *)fus_textColorLight{
return [UIColor colorWithHex:@"#808080"];
}
+ (UIColor *)fus_textColorVeryLight{
return [UIColor colorWithHex:@"#FFFFFF"];
}
+ (UIColor *)fus_alertViewBackgroundColor{
return [UIColor colorWithHex:@"#000000" alpha:0.6];
}
@end @end
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_close_black_circle_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_close_black_circle_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_close_black_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_close_black_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_first_love_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_first_love_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_navi_service_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_navi_service_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_navigation_back_black@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_navigation_back_black@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_sex_female_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_sex_female_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_sex_male_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_sex_male_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_home_broadcastAlert_logo_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_broadcastAlert_logo_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_home_navi_follow_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_navi_follow_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_home_navi_rank_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_navi_rank_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_home_navi_search_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_navi_search_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_home_navi_share_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_navi_share_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_home_navi_startLive_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_home_navi_startLive_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_live_responsbilityConfirm_confirm_select@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_live_responsbilityConfirm_confirm_select@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_live_responsbilityConfirm_confirm_unselect@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_live_responsbilityConfirm_confirm_unselect@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_message_functionColumn_dew_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_message_functionColumn_dew_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_message_functionColumn_diamond_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_message_functionColumn_diamond_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_message_functionColumn_fire_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_message_functionColumn_fire_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_message_functionColumn_invitationAndFollow_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_message_functionColumn_invitationAndFollow_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_message_notificationRemind_bell_img@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_message_notificationRemind_bell_img@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_my_ImAnchor_item_activity_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_my_ImAnchor_item_activity_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_my_ImAnchor_item_broadcastBuild_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_my_ImAnchor_item_broadcastBuild_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_my_ImAnchor_item_liveTask_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_my_ImAnchor_item_liveTask_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_my_ImAnchor_item_liveTime_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_my_ImAnchor_item_liveTime_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_my_ImAnchor_item_popular_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_my_ImAnchor_item_popular_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment