This commit is contained in:
lianxiang
2018-10-12 09:12:54 +08:00
parent dc1b1e330f
commit 97af177b88
37 changed files with 583 additions and 173 deletions
@@ -88,7 +88,17 @@ typedef NS_ENUM(NSUInteger, GYTitlePosition) {
weakSelf.textLabel.layer.position = weakSelf.bottomPosition;
weakSelf.needDealy = DEALY_WHEN_TITLE_IN_BOTTOM;
weakSelf.currentIndex ++;
weakSelf.textLabel.text = [weakSelf.contentsAry objectAtIndex:[weakSelf realCurrentIndex]];
NSString *tex = [weakSelf.contentsAry objectAtIndex:[weakSelf realCurrentIndex]];
if ([tex isEqualToString:@"面膜时间"]) {
weakSelf.textLabel.font = GIGA_TEXTFONTMEDIUM(18);
}else{
if (KMainW < 375) {
weakSelf.textLabel.font = GIGA_TEXTFONTMEDIUM(10);
}else{
weakSelf.textLabel.font = GIGA_TEXTFONTMEDIUM(12);
}
}
weakSelf.textLabel.text = tex;
} else {
weakSelf.needDealy = DEALY_WHEN_TITLE_IN_MIDDLE;
}
@@ -96,7 +106,17 @@ typedef NS_ENUM(NSUInteger, GYTitlePosition) {
[weakSelf startAnimation];
} else { //停止动画后,要设置label位置和label显示内容
weakSelf.textLabel.layer.position = weakSelf.middlePosition;
weakSelf.textLabel.text = [weakSelf.contentsAry objectAtIndex:[weakSelf realCurrentIndex]];
NSString *tex = [weakSelf.contentsAry objectAtIndex:[weakSelf realCurrentIndex]];
if ([tex isEqualToString:@"面膜时间"]) {
weakSelf.textLabel.font = GIGA_TEXTFONTMEDIUM(18);
}else{
if (KMainW < 375) {
weakSelf.textLabel.font = GIGA_TEXTFONTMEDIUM(10);
}else{
weakSelf.textLabel.font = GIGA_TEXTFONTMEDIUM(12);
}
}
weakSelf.textLabel.text = tex;
}
}];
}