Skip to content

pidan / FuSiLive

Go to a project
Commit 508154cf by pierce
Options

Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

parents 356b5d11 3e302b59
Inline Side-by-side
Showing with 7 additions and 6 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.m
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)]; [self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateDisabled];
} }
break; break;
case FUSButtonStyleGradientUpsideDown: case FUSButtonStyleGradientUpsideDown:
...@@ -193,6 +194,7 @@ ...@@ -193,6 +194,7 @@
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)]; [self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateDisabled];
} }
break; break;
case FUSButtonStyleGradientBorder: case FUSButtonStyleGradientBorder:
...@@ -203,6 +205,7 @@ ...@@ -203,6 +205,7 @@
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)]; [self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateDisabled];
} }
break; break;
case FUSButtonStyleWhiteBorder: case FUSButtonStyleWhiteBorder:
...@@ -227,6 +230,7 @@ ...@@ -227,6 +230,7 @@
[self.layer insertSublayer:self.imageView.layer above:_bgLayer]; [self.layer insertSublayer:self.imageView.layer above:_bgLayer];
[self setTitleColor:[UIColor fus_textColorLight2] forState:(UIControlStateNormal)]; [self setTitleColor:[UIColor fus_textColorLight2] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_textColorLight2] forState:UIControlStateDisabled];
} }
break; break;
case FUSButtonStyleBlue: case FUSButtonStyleBlue:
...@@ -251,6 +255,7 @@ ...@@ -251,6 +255,7 @@
self.backgroundColor = [UIColor clearColor]; self.backgroundColor = [UIColor clearColor];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)]; [self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateDisabled];
} }
break; break;
default: default:
...@@ -277,6 +282,7 @@ ...@@ -277,6 +282,7 @@
self.layer.borderColor = [[UIColor clearColor] CGColor]; self.layer.borderColor = [[UIColor clearColor] CGColor];
[self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)]; [self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateDisabled];
[self.gradientView.layer removeFromSuperlayer]; [self.gradientView.layer removeFromSuperlayer];
self.gradientView = nil; self.gradientView = nil;
...@@ -376,11 +382,6 @@ ...@@ -376,11 +382,6 @@
self.alpha = 0.5; self.alpha = 0.5;
} }
} }
// ludy: 其他颜色设置enable=no会沿用FUSButtonStyleBlue的颜色
if (_style != FUSButtonStyleBlue) {
[self setTitleColor:[self titleColorForState:UIControlStateNormal] forState:UIControlStateSelected];
}
} }
- (void)setHighlighted:(BOOL)highlighted - (void)setHighlighted:(BOOL)highlighted
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorListSmallCell.m
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
self.locationBtn.hidden = NO; self.locationBtn.hidden = NO;
[self.locationBtn setTitle:model.addr forState:UIControlStateNormal]; [self.locationBtn setTitle:model.addr forState:UIControlStateNormal];
} }
if ([NSString isNull:model.hotSum]) { if ([NSString isNull:model.hotSum] || model.roomType == 2) {
self.hotNumBtn.hidden = YES; self.hotNumBtn.hidden = YES;
}else { }else {
self.hotNumBtn.hidden = NO; self.hotNumBtn.hidden = NO;
......
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