Commit 4d45a9b0 cgx

修复5s部分UI适配问题

1 个父辈 b8f4992c
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
UILabel *lab3 = [UILabel labWithText:@"慢节奏轻点屏幕" textColor:ColorFromHexA(0x8565AA, .6) font:SysFont(10.0)]; UILabel *lab3 = [UILabel labWithText:@"慢节奏轻点屏幕" textColor:ColorFromHexA(0x8565AA, .6) font:SysFont(10.0)];
[iv addSubview:lab3]; [iv addSubview:lab3];
UILabel *lab4 = [UILabel labWithText:@"有效降低心率助眠" textColor:ColorFromHexA(0x8565AA, .6) font:SysFont(10.0)]; UILabel *lab4 = [UILabel labWithText:@"有效降低心率助眠" textColor:ColorFromHexA(0x8565AA, .6) font:SysFont(10.0)];
lab4.numberOfLines = 0;
[iv addSubview:lab4]; [iv addSubview:lab4];
UILabel *lab5 = [UILabel labWithText:@"推荐" textColor:DSWhite font:BoldFont(14.0)]; UILabel *lab5 = [UILabel labWithText:@"推荐" textColor:DSWhite font:BoldFont(14.0)];
lab5.textAlignment = NSTextAlignmentCenter; lab5.textAlignment = NSTextAlignmentCenter;
...@@ -93,6 +94,7 @@ ...@@ -93,6 +94,7 @@
}]; }];
[lab4 mas_makeConstraints:^(MASConstraintMaker *make) { [lab4 mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(lab1); make.left.equalTo(lab1);
make.right.equalTo(iv).offset(-5);
make.top.equalTo(lab3.mas_bottom).offset(4); make.top.equalTo(lab3.mas_bottom).offset(4);
}]; }];
[lab5 mas_makeConstraints:^(MASConstraintMaker *make) { [lab5 mas_makeConstraints:^(MASConstraintMaker *make) {
...@@ -104,9 +106,9 @@ ...@@ -104,9 +106,9 @@
} else if (i == 1) { } else if (i == 1) {
self.balanceIV = iv; self.balanceIV = iv;
UILabel *lab1 = [UILabel labWithText:@"高效均衡" textColor:ColorFromHex(0x70B891) font:BoldFont(16.0)]; UILabel *lab1 = [UILabel labWithText:@"高效均衡" textColor:ColorFromHex(0x70B891) font:BoldFont(14.0)];
[iv addSubview:lab1]; [iv addSubview:lab1];
UILabel *lab2 = [UILabel labWithText:@"呼吸法" textColor:ColorFromHex(0x70B891) font:BoldFont(16.0)]; UILabel *lab2 = [UILabel labWithText:@"呼吸法" textColor:ColorFromHex(0x70B891) font:BoldFont(14.0)];
[iv addSubview:lab2]; [iv addSubview:lab2];
[lab1 mas_makeConstraints:^(MASConstraintMaker *make) { [lab1 mas_makeConstraints:^(MASConstraintMaker *make) {
...@@ -120,9 +122,9 @@ ...@@ -120,9 +122,9 @@
} else if (i == 2) { } else if (i == 2) {
self.comfortableIV = iv; self.comfortableIV = iv;
UILabel *lab1 = [UILabel labWithText:@"海军快速入眠" textColor:ColorFromHex(0x8EB2E8) font:BoldFont(16.0)]; UILabel *lab1 = [UILabel labWithText:@"海军快速" textColor:ColorFromHex(0x8EB2E8) font:BoldFont(14.0)];
[iv addSubview:lab1]; [iv addSubview:lab1];
UILabel *lab2 = [UILabel labWithText:@"特训" textColor:ColorFromHex(0x8EB2E8) font:BoldFont(16.0)]; UILabel *lab2 = [UILabel labWithText:@"入眠特训" textColor:ColorFromHex(0x8EB2E8) font:BoldFont(14.0)];
[iv addSubview:lab2]; [iv addSubview:lab2];
[lab1 mas_makeConstraints:^(MASConstraintMaker *make) { [lab1 mas_makeConstraints:^(MASConstraintMaker *make) {
......
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
[_openAIBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside]; [_openAIBtn addTarget:self action:@selector(scoreTaskAction:) forControlEvents:UIControlEventTouchUpInside];
[self.scoreTaskEvaluateView addSubview:_openAIBtn]; [self.scoreTaskEvaluateView addSubview:_openAIBtn];
UILabel *titleLab = [UILabel labWithText:@"开通AI睡眠教练享专业报告与测评" font:BoldFont(14.0) fit:YES]; UILabel *titleLab = [UILabel labWithText:@"开通AI睡眠教练享专业报告与测评" font:(iPhone5 ? BoldFont(12.0) : BoldFont(14.0)) fit:YES];
titleLab.dk_textColorPicker = DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite); titleLab.dk_textColorPicker = DKColorPickerWithColors(MainTextColor, DkTitleColor, DSWhite);
[_openAIBtn addSubview:titleLab]; [_openAIBtn addSubview:titleLab];
[titleLab mas_makeConstraints:^(MASConstraintMaker *make) { [titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!