Commit a4065ff2 by ludi

修复一些bug

parent 60681f0a
......@@ -129,6 +129,7 @@
[_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateDisabled];
}
break;
case FUSButtonStyleGradientUpsideDown:
......@@ -193,6 +194,7 @@
[_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateDisabled];
}
break;
case FUSButtonStyleGradientBorder:
......@@ -203,6 +205,7 @@
[_bgLayer addSublayer:_gradientView.layer];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateDisabled];
}
break;
case FUSButtonStyleWhiteBorder:
......@@ -227,6 +230,7 @@
[self.layer insertSublayer:self.imageView.layer above:_bgLayer];
[self setTitleColor:[UIColor fus_textColorLight2] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_textColorLight2] forState:UIControlStateDisabled];
}
break;
case FUSButtonStyleBlue:
......@@ -251,6 +255,7 @@
self.backgroundColor = [UIColor clearColor];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateDisabled];
}
break;
default:
......@@ -277,6 +282,7 @@
self.layer.borderColor = [[UIColor clearColor] CGColor];
[self setTitleColor:[UIColor fus_textColorRich] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateDisabled];
[self.gradientView.layer removeFromSuperlayer];
self.gradientView = nil;
......@@ -376,11 +382,6 @@
self.alpha = 0.5;
}
}
// ludy: 其他颜色设置enable=no会沿用FUSButtonStyleBlue的颜色
if (_style != FUSButtonStyleBlue) {
[self setTitleColor:[self titleColorForState:UIControlStateNormal] forState:UIControlStateSelected];
}
}
- (void)setHighlighted:(BOOL)highlighted
......
......@@ -145,7 +145,7 @@
self.locationBtn.hidden = NO;
[self.locationBtn setTitle:model.addr forState:UIControlStateNormal];
}
if ([NSString isNull:model.hotSum]) {
if ([NSString isNull:model.hotSum] || model.roomType == 2) {
self.hotNumBtn.hidden = YES;
}else {
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