Commit 67dd2891 by suolong

修改颜色问题

parent 5648c868
Showing with 26 additions and 26 deletions
......@@ -300,7 +300,7 @@
self.cancelBtn = cancelBtn;
UIButton *saveBtn = [UIButton buttonWithType:UIButtonTypeCustom];
saveBtn.backgroundColor = [UIColor colorWithHex:@"#01D9E0"];
saveBtn.backgroundColor = [UIColor fus_themeColor];
saveBtn.layer.cornerRadius = 22;
saveBtn.clipsToBounds = YES;
saveBtn.titleLabel.font = [UIFont fus_themeFont:16];
......
......@@ -34,7 +34,7 @@
[self.contentView addSubview:self.subTitleLabel];
self.enableSwitch = [[UISwitch alloc] initWithFrame:CGRectZero];
self.enableSwitch.onTintColor = [UIColor colorWithHex:@"#01D9E0"];
self.enableSwitch.onTintColor = [UIColor fus_diamondBlue];
[self.enableSwitch addTarget:self action:@selector(onSwitchChanged:) forControlEvents:UIControlEventValueChanged];
[self.contentView addSubview:self.enableSwitch];
......
......@@ -48,7 +48,7 @@
[self.contentView addSubview:self.giftInfoLabel];
self.itemSwitch = [[UISwitch alloc] initWithFrame:CGRectZero];
self.itemSwitch.onTintColor = [UIColor colorWithHex:@"#01D9E0"];
self.itemSwitch.onTintColor = [UIColor fus_diamondBlue];
[self.itemSwitch addTarget:self action:@selector(onSwitchChanged:) forControlEvents:UIControlEventValueChanged];
[self.contentView addSubview:self.itemSwitch];
......
......@@ -95,7 +95,7 @@
self.confirmBtn.frame = CGRectMake(24, self.contentView.height - safeBottom - 14 - btnH, self.contentView.width - 48, btnH);
self.confirmBtn.layer.cornerRadius = btnH / 2.0;
self.confirmBtn.layer.masksToBounds = YES;
self.confirmBtn.backgroundColor = [UIColor fus_appMainColor];
self.confirmBtn.backgroundColor = [UIColor fus_themeColor];
[self.confirmBtn setTitle:[NSString fus_localString:@"确定"] forState:UIControlStateNormal];
[self.confirmBtn setTitleColor:UIColor.blackColor forState:UIControlStateNormal];
self.confirmBtn.titleLabel.font = [UIFont fus_themeBoldFont:15];
......
......@@ -206,7 +206,7 @@ static const NSInteger kFUSShowTimeCollectSeconds = 60 * 10;
self.cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.cancelBtn.layer.cornerRadius = 13;
self.cancelBtn.layer.masksToBounds = YES;
self.cancelBtn.backgroundColor = [UIColor colorWithHex:@"#52DDE2"];
self.cancelBtn.backgroundColor = [UIColor fus_themeColor];
[self.cancelBtn setTitle:[NSString fus_localString:@"取消集票"] forState:UIControlStateNormal];
[self.cancelBtn setTitleColor:UIColor.blackColor forState:UIControlStateNormal];
self.cancelBtn.titleLabel.font = [UIFont fus_themeBoldFont:12];
......@@ -226,7 +226,7 @@ static const NSInteger kFUSShowTimeCollectSeconds = 60 * 10;
self.statusTagLabel.textAlignment = NSTextAlignmentCenter;
self.statusTagLabel.font = [UIFont fus_themeBoldFont:10];
self.statusTagLabel.textColor = UIColor.blackColor;
self.statusTagLabel.backgroundColor = [UIColor colorWithHex:@"#52DDE2"];
self.statusTagLabel.backgroundColor = [UIColor fus_themeColor];
self.statusTagLabel.layer.cornerRadius = 8;
self.statusTagLabel.layer.masksToBounds = YES;
[self.blurView.contentView addSubview:self.statusTagLabel];
......@@ -386,7 +386,7 @@ static const NSInteger kFUSShowTimeCollectSeconds = 60 * 10;
if (!self.progressLayer) {
self.progressLayer = [CAShapeLayer layer];
self.progressLayer.strokeColor = [UIColor colorWithHex:@"#52DDE2"].CGColor;
self.progressLayer.strokeColor = [UIColor fus_themeColor].CGColor;
self.progressLayer.fillColor = UIColor.clearColor.CGColor;
self.progressLayer.lineWidth = lineW;
self.progressLayer.lineCap = kCALineCapRound;
......@@ -483,7 +483,7 @@ static const NSInteger kFUSShowTimeCollectSeconds = 60 * 10;
CGFloat clamped = MIN(1.0, MAX(0.0, progress));
self.progressLayer.strokeEnd = clamped;
if (self.stageStatus == 2) {
self.progressLabel.textColor = [UIColor colorWithHex:@"#52DDE2"];
self.progressLabel.textColor = [UIColor fus_themeColor];
self.progressLabel.text = [NSString fus_localString:@"表演中"];
} else {
self.progressLabel.textColor = UIColor.whiteColor;
......@@ -625,7 +625,7 @@ static const NSInteger kFUSShowTimeCollectSeconds = 60 * 10;
}
unichar c = [substring characterAtIndex:0];
if ([[NSCharacterSet decimalDigitCharacterSet] characterIsMember:c]) {
[attributedText addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"#52DDE2"] range:substringRange];
[attributedText addAttribute:NSForegroundColorAttributeName value:[UIColor fus_themeColor] range:substringRange];
}
}];
self.remainingLabel.attributedText = attributedText;
......
......@@ -169,7 +169,7 @@ static const NSInteger kFUSShowTimeTicketMax = 50;
self.startBtn.frame = CGRectMake(24, self.contentView.height - safeBottom - 14 - btnH, self.contentView.width - 48, btnH);
self.startBtn.layer.cornerRadius = btnH / 2.0;
self.startBtn.layer.masksToBounds = YES;
self.startBtn.backgroundColor = [UIColor fus_appMainColor];
self.startBtn.backgroundColor = [UIColor fus_themeColor];
[self.startBtn setTitle:[NSString fus_localString:@"开启集票"] forState:UIControlStateNormal];
[self.startBtn setTitleColor:UIColor.blackColor forState:UIControlStateNormal];
self.startBtn.titleLabel.font = [UIFont fus_themeBoldFont:15];
......
......@@ -137,7 +137,7 @@
[super setSelected:selected];
self.cardView.layer.borderWidth = (selected ? 1.5 : 1);
self.cardView.layer.borderColor = (selected ? [UIColor colorWithHex:@"#52DDE2"].CGColor : [UIColor colorWithHex:@"#E6E8EB"].CGColor);
self.cardView.layer.borderColor = (selected ? [UIColor fus_diamondBlue].CGColor : [UIColor colorWithHex:@"#E6E8EB"].CGColor);
}
- (void)fus_setupCountText:(NSString *)countText priceText:(NSString *)priceText tagText:(nullable NSString *)tagText {
......@@ -419,7 +419,7 @@
CGFloat confirmH = 40;
self.confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.confirmBtn.backgroundColor = [UIColor colorWithHex:@"#52DDE2"];
self.confirmBtn.backgroundColor = [UIColor fus_themeColor];
self.confirmBtn.layer.cornerRadius = confirmH / 2.0;
self.confirmBtn.layer.masksToBounds = YES;
[self.confirmBtn setTitle:[NSString fus_localString:@"进入限时表演"] forState:UIControlStateNormal];
......@@ -514,7 +514,7 @@
self.ownedValueLabel = [[UILabel alloc] initWithFrame:CGRectZero];
self.ownedValueLabel.font = [UIFont fus_themeBoldFont:12];
self.ownedValueLabel.textColor = [UIColor colorWithHex:@"#52DDE2"];
self.ownedValueLabel.textColor = [UIColor fus_themeColor];
self.ownedValueLabel.text = @"--";
[bottomLeftContentView addSubview:self.ownedValueLabel];
......@@ -531,7 +531,7 @@
self.mvpOwnedValueLabel = [[UILabel alloc] initWithFrame:CGRectZero];
self.mvpOwnedValueLabel.font = [UIFont fus_themeBoldFont:12];
self.mvpOwnedValueLabel.textColor = [UIColor colorWithHex:@"#52DDE2"];
self.mvpOwnedValueLabel.textColor = [UIColor fus_themeColor];
self.mvpOwnedValueLabel.text = @"--";
[bottomRightContentView addSubview:self.mvpOwnedValueLabel];
......
......@@ -535,7 +535,7 @@ NSString * const FUSLiveShowTimeAudienceEntryTicketOptionImageNameTextKey = @"im
self.enterButton = [UIButton buttonWithType:UIButtonTypeCustom];
self.enterButton.titleLabel.font = [UIFont fus_themeMediumFont:15];
[self.enterButton setTitleColor:[UIColor colorWithHex:@"#003333"] forState:UIControlStateNormal];
self.enterButton.backgroundColor = [UIColor colorWithRed:(45.0 / 255.0) green:(226.0 / 255.0) blue:(224.0 / 255.0) alpha:1.0];
self.enterButton.backgroundColor = [UIColor fus_themeColor];
self.enterButton.layer.cornerRadius = 22;
self.enterButton.layer.masksToBounds = YES;
[self.cardView addSubview:self.enterButton];
......
......@@ -84,7 +84,7 @@ static NSInteger const kFUSLiveShowTimeAudienceEntryNoticeViewTag = 90917003;
self.confirmButton.titleLabel.font = [UIFont fus_themeMediumFont:15];
[self.confirmButton setTitle:[NSString fus_localString:@"確認"] forState:UIControlStateNormal];
[self.confirmButton setTitleColor:[UIColor colorWithHex:@"#003333"] forState:UIControlStateNormal];
self.confirmButton.backgroundColor = [UIColor colorWithRed:(45.0 / 255.0) green:(226.0 / 255.0) blue:(224.0 / 255.0) alpha:1.0];
self.confirmButton.backgroundColor = [UIColor fus_themeColor];
self.confirmButton.layer.cornerRadius = 22;
self.confirmButton.layer.masksToBounds = YES;
[self.confirmButton addTarget:self action:@selector(onTapConfirm) forControlEvents:UIControlEventTouchUpInside];
......
......@@ -45,7 +45,7 @@ static NSString *fus_substringComposedToLength(NSString *text, NSUInteger maxLen
self.userInteractionEnabled = YES;
self.headerView = [[UIView alloc] initWithFrame:CGRectZero];
self.headerView.backgroundColor = [UIColor colorWithHex:@"36E6ED" alpha:1];
self.headerView.backgroundColor = [UIColor fus_themeColor];
[self addSubview:self.headerView];
self.headerIconView = [[UIImageView alloc] initWithFrame:CGRectZero];
......
......@@ -47,7 +47,7 @@ static NSString *fus_substringComposedToLength(NSString *text, NSUInteger maxLen
self.userInteractionEnabled = YES;
self.headerView = [[UIView alloc] initWithFrame:CGRectZero];
self.headerView.backgroundColor = [UIColor colorWithHex:@"36E6ED" alpha:1];
self.headerView.backgroundColor = [UIColor fus_themeColor];
[self addSubview:self.headerView];
self.headerIconView = [[UIImageView alloc] initWithFrame:CGRectZero];
......
......@@ -198,7 +198,7 @@ static CGFloat const kFUSPayRoomCompanionRechargeDefaultHeight = 160.0;
self.rechargeBtn.frame = CGRectMake(contentPadding, btnTop, contentW, btnH);
self.rechargeBtn.layer.cornerRadius = btnH / 2.0;
self.rechargeBtn.layer.masksToBounds = YES;
self.rechargeBtn.backgroundColor = [UIColor colorWithHex:@"#00F7FF"];
self.rechargeBtn.backgroundColor = [UIColor fus_themeColor];
self.rechargeBtn.titleLabel.font = [UIFont boldSystemFontOfSize:12];
[self.rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal];
[self.rechargeBtn setTitleColor:[UIColor colorWithHex:@"#111111"] forState:UIControlStateNormal];
......
......@@ -27,7 +27,7 @@
self.fillImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 0, self.bounds.size.height)];
self.fillImageView.contentMode = UIViewContentModeScaleToFill;
self.fillImageView.backgroundColor = [UIColor colorWithHex:@"#00F7FF"];
self.fillImageView.backgroundColor = [UIColor fus_themeColor];
self.fillImageView.layer.cornerRadius = self.bounds.size.height / 2.0;
self.fillImageView.layer.masksToBounds = YES;
[self addSubview:self.fillImageView];
......
......@@ -217,7 +217,7 @@
self.primaryButton = [UIButton buttonWithType:UIButtonTypeCustom];
self.primaryButton.titleLabel.font = [UIFont fus_themeMediumFont:15];
[self.primaryButton setTitleColor:[UIColor colorWithHex:@"#003333"] forState:UIControlStateNormal];
self.primaryButton.backgroundColor = [UIColor colorWithRed:(45.0 / 255.0) green:(226.0 / 255.0) blue:(224.0 / 255.0) alpha:1.0];
self.primaryButton.backgroundColor = [UIColor fus_themeColor];
self.primaryButton.layer.cornerRadius = 22;
self.primaryButton.layer.masksToBounds = YES;
[self.cardView addSubview:self.primaryButton];
......
......@@ -129,7 +129,7 @@
[self.contentView addSubview:self.blurView];
self.headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.contentView.width, 33)];
self.headerView.backgroundColor = [UIColor colorWithRed:(45.0 / 255.0) green:(226.0 / 255.0) blue:(224.0 / 255.0) alpha:1.0];
self.headerView.backgroundColor = [UIColor fus_themeColor];
[self.contentView addSubview:self.headerView];
self.titleContainerView = [[UIView alloc] initWithFrame:CGRectZero];
......
......@@ -75,7 +75,7 @@ static const NSInteger kFUSLiveShowTimeFrostCardPopViewTag = 8817402;
[self.confirmBtn setTitle:[NSString fus_localString:@"确认"] forState:UIControlStateNormal];
self.confirmBtn.titleLabel.font = [UIFont fus_themeBoldFont:16];
[self.confirmBtn setTitleColor:UIColor.blackColor forState:UIControlStateNormal];
self.confirmBtn.backgroundColor = [UIColor colorWithHex:@"#01D9E0"];
self.confirmBtn.backgroundColor = [UIColor fus_themeColor];
self.confirmBtn.layer.cornerRadius = 22;
self.confirmBtn.layer.masksToBounds = YES;
// 单一关闭入口:点击确认后收起弹窗
......@@ -140,7 +140,7 @@ static const NSInteger kFUSLiveShowTimeFrostCardPopViewTag = 8817402;
NSString *numText = [NSString stringWithFormat:@"%zd", (NSInteger)safeNum];
NSRange numRange = [content rangeOfString:numText];
if (numRange.location != NSNotFound && numRange.length > 0) {
[attr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"#01D9E0"] range:numRange];
[attr addAttribute:NSForegroundColorAttributeName value:[UIColor fus_diamondBlue] range:numRange];
}
self.ticketCountLabel.attributedText = attr;
}
......
......@@ -95,7 +95,7 @@ static const NSInteger kFUSLiveShowTimeMVPConfirmPopViewTag = 8817401;
self.ticketCountLabel = [[UILabel alloc] init];
self.ticketCountLabel.textAlignment = NSTextAlignmentCenter;
self.ticketCountLabel.font = [UIFont fus_themeBoldFont:44];
self.ticketCountLabel.textColor = [UIColor colorWithHex:@"#01D9E0"];
self.ticketCountLabel.textColor = [UIColor fus_diamondBlue];
self.ticketCountLabel.text = @"--";
[self.contentView addSubview:self.ticketCountLabel];
......@@ -121,7 +121,7 @@ static const NSInteger kFUSLiveShowTimeMVPConfirmPopViewTag = 8817401;
[self.confirmBtn setTitle:[NSString fus_localString:@"确认"] forState:UIControlStateNormal];
self.confirmBtn.titleLabel.font = [UIFont fus_themeBoldFont:16];
[self.confirmBtn setTitleColor:UIColor.blackColor forState:UIControlStateNormal];
self.confirmBtn.backgroundColor = [UIColor colorWithHex:@"#01D9E0"];
self.confirmBtn.backgroundColor = [UIColor fus_themeColor];
self.confirmBtn.layer.cornerRadius = 22;
self.confirmBtn.layer.masksToBounds = YES;
[self.confirmBtn addTarget:self action:@selector(onConfirm) forControlEvents:UIControlEventTouchUpInside];
......
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