root/GiGaMaskTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.0

Browse Source
This commit is contained in:
lianxiang
2018-09-29 20:12:56 +08:00
parent cb0accdb66
commit fc47921130
99 changed files with 1635 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GIGA/Modules/Mask/Exercises/View/MaskResultViews/MaskResultMinViewCell.m
+42 -14
View File
@@ -30,6 +30,7 @@
twoLabel.textColor = GIGARGB(240, 147, 147, 0.1);
twoLabel.alpha = 0.6;
twoLabel.font = GIGA_TEXTFONTMEDIUM(200);
//oneLabel.backgroundColor = [UIColor redColor];
[self addSubview:twoLabel];
self.twoLabel = twoLabel;
@@ -42,29 +43,55 @@
make.bottom.mas_equalTo(self.mas_bottom);
}];
UILabel *jianyiLabel = [[UILabel alloc] init];
//jianyiLabel.backgroundColor = [UIColor redColor];
jianyiLabel.text = @"建议敷面膜时间";
jianyiLabel.textColor = [UIColor blackColor];
jianyiLabel.font = GIGA_TEXTFONTBOLD(24);
[self addSubview:jianyiLabel];
[jianyiLabel sizeToFit];
[jianyiLabel mas_makeConstraints:^(MASConstraintMaker *make) {
UIImageView *jianyiImageView = [[UIImageView alloc] init];
jianyiImageView.contentMode = UIViewContentModeScaleAspectFit;
jianyiImageView.image = [UIImage imageNamed:@"share_tim"];
[self addSubview:jianyiImageView];
[jianyiImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.mas_left).offset(40);
make.top.mas_equalTo(self.mas_top).offset(36);
if (KMainW < 375) {
make.size.mas_equalTo(CGSizeMake(139, 30));
}else{
make.size.mas_equalTo(CGSizeMake(179, 30));
}
}];
//时间⌚️
UILabel *timeLabel = [[UILabel alloc] init];
timeLabel.textColor = [UIColor blackColor];
timeLabel.font = GIGA_TEXTFONTBOLD(35);
timeLabel.text = @"17分钟";
if (KMainW < 375) {
timeLabel.font = GIGA_TEXTFONTBOLD(24);
}else{
timeLabel.font = GIGA_TEXTFONTBOLD(35);
}
timeLabel.text = @"17";
self.timeLabel = timeLabel;
[self addSubview:timeLabel];
[timeLabel sizeToFit];
[timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.mas_left).offset(73);
make.top.mas_equalTo(jianyiLabel.mas_bottom).offset(20);
make.top.mas_equalTo(jianyiImageView.mas_bottom).offset(20);
}];
//分钟图片
UIImageView *minueImageview = [[UIImageView alloc] init];
minueImageview.image = [UIImage imageNamed:@"share_minute"];
minueImageview.contentMode = UIViewContentModeScaleAspectFit;
[self addSubview:minueImageview];
[minueImageview mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(timeLabel.mas_right);
if (KMainW < 375) {
//se 5s
make.size.mas_equalTo(CGSizeMake(48, 49));
}else{
make.size.mas_equalTo(CGSizeMake(72, 49));
}
make.centerY.mas_equalTo(timeLabel.mas_centerY);
}];
//左侧红色梯形区域
@@ -91,7 +118,8 @@
}];
[self bringSubviewToFront:jianyiLabel];
[self bringSubviewToFront:jianyiImageView];
[self bringSubviewToFront:minueImageview];
[self bringSubviewToFront:timeLabel];
}
@@ -128,7 +156,7 @@
if ([minute isKindOfClass:[NSNull class]]) {
minute = @"17";
}
NSString *time = [NSString stringWithFormat:@"%@分钟",minute];
NSString *time = [NSString stringWithFormat:@"%@",minute];
self.timeLabel.text = time;
}
GIGA/Modules/Mask/Exercises/View/MaskResultViews/MaskResultPercentCell.m
+5 -1
View File
@@ -80,7 +80,11 @@
UILabel *duibiLabel = [[UILabel alloc] init];
duibiLabel.text = @"皮肤水油比";
duibiLabel.textColor = GIGARGB(55, 55, 55, 1);
duibiLabel.font = GIGA_TEXTFONTBOLD(24);
if (KMainW < 375) {
duibiLabel.font = GIGA_TEXTFONTBOLD(20);
}else{
duibiLabel.font = GIGA_TEXTFONTBOLD(24);
}
[self addSubview:duibiLabel];
[duibiLabel sizeToFit];
[duibiLabel mas_makeConstraints:^(MASConstraintMaker *make) {
GIGA/Modules/Mask/Exercises/View/MaskResultViews/MaskResultShareViewCell.h
+2 -1
View File
@@ -15,6 +15,7 @@
-(void)kidTitle:(MaskTestResult *)model;
@property (nonatomic,strong) UILabel *candLabe;
@property (nonatomic,strong) UIImageView *qrcodeImage;
@property (nonatomic,strong) UILabel *lastLabe;
@end
GIGA/Modules/Mask/Exercises/View/MaskResultViews/MaskResultShareViewCell.m
+35 -4
View File
@@ -38,13 +38,18 @@
UILabel *candLabe = [[UILabel alloc] init];
candLabe.textColor = [UIColor blackColor];
candLabe.text = @"全效型";
candLabe.font = GIGA_TEXTFONTBOLD(30);
if (KMainW < 375) {
candLabe.font = GIGA_TEXTFONTBOLD(20);
}else{
candLabe.font = GIGA_TEXTFONTBOLD(30);
}
self.candLabe = candLabe;
[self addSubview:candLabe];
[candLabe sizeToFit];
[candLabe mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(shiheLabe.mas_right);
make.top.mas_equalTo(self.mas_top).offset(30);
make.centerY.mas_equalTo(shiheLabe.mas_centerY);
}];
//小图标
NSArray * imagesArr = @[@"result_water",@"result_moon",@"result_push"];
@@ -82,7 +87,31 @@
[logo mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(self.mas_left).offset(26);
make.size.mas_equalTo(CGSizeMake(36, 36));
make.top.mas_equalTo(shareBtn.mas_bottom).offset(7);
if (KMainW < 375) {
make.top.mas_equalTo(self.mas_bottom).offset(-33);
}else{
make.top.mas_equalTo(self.mas_bottom).offset(-21);
}
}];
UIImageView *qrcodeImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"applink"]];
[self addSubview:qrcodeImage];
self.qrcodeImage = qrcodeImage;
self.qrcodeImage.hidden = YES;
[qrcodeImage mas_makeConstraints:^(MASConstraintMaker *make) {
if (KMainW < 375) {
make.size.mas_equalTo(CGSizeMake(60, 60));
make.right.mas_equalTo(self.mas_right).offset(-10);
}else{
make.size.mas_equalTo(CGSizeMake(85, 85));
make.right.mas_equalTo(self.mas_right).offset(-25);
}
make.bottom.mas_equalTo(self.mas_bottom).offset(15);
}];
UILabel *lastLabe = [[UILabel alloc] init];
@@ -90,11 +119,13 @@
lastLabe.font = GIGA_TEXTFONTBOLD(12);
lastLabe.textColor = GIGARGB(166, 33, 33, 1);
[self addSubview:lastLabe];
self.lastLabe = lastLabe;
[lastLabe sizeToFit];
[lastLabe mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.mas_equalTo(logo.mas_centerY);
make.centerX.mas_equalTo(self.mas_centerX);
make.top.mas_equalTo(shareBtn.mas_bottom).offset(15);
}];
//3