Commit 5c79badf cgx

修复已签到积分显示问题(布局问题)

1 个父辈 496223a0
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
// 积分需要动画显示效果 // 积分需要动画显示效果
[self.pointsLab changeToNumber:@(points) animated:YES]; [self.pointsLab changeToNumber:@(points) animated:YES];
self.todayLab.text = @"今日积分"; self.todayLab.text = @"今日积分";
[self.pointsLab mas_makeConstraints:^(MASConstraintMaker *make) { [self.pointsLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self).offset(15); make.left.equalTo(self).offset(15);
make.top.equalTo(self).offset(136); make.top.equalTo(self).offset(136);
make.size.mas_equalTo(CGSizeMake(self.pointsLab.frame.size.width, self.pointsLab.frame.size.height)); make.size.mas_equalTo(CGSizeMake(self.pointsLab.frame.size.width, self.pointsLab.frame.size.height));
......
...@@ -400,27 +400,27 @@ static NSString * const numberCellText = @"0\n9\n8\n7\n6\n5\n4\n3\n2\n1\n0\n1\n2 ...@@ -400,27 +400,27 @@ static NSString * const numberCellText = @"0\n9\n8\n7\n6\n5\n4\n3\n2\n1\n0\n1\n2
[UIView animateWithDuration:attribute.startDuration delay:attribute.startDelay options:UIViewAnimationOptionCurveEaseIn animations:^{ [UIView animateWithDuration:attribute.startDuration delay:attribute.startDelay options:UIViewAnimationOptionCurveEaseIn animations:^{
[self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease)? 10 : 0 sign:attribute.sign]; [self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease)? 10 : 0 sign:attribute.sign];
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
NSLog(@"start animation finish!"); DSLog(@"start animation finish!");
[self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease)? 0 : 10 sign:attribute.sign]; [self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease)? 0 : 10 sign:attribute.sign];
if (attribute.cycleDuration == 0) { if (attribute.cycleDuration == 0) {
[UIView animateWithDuration:attribute.endDuration delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{ [UIView animateWithDuration:attribute.endDuration delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
[self moveNumberCell:cell toNumber:attribute.targetNumber sign:attribute.sign]; [self moveNumberCell:cell toNumber:attribute.targetNumber sign:attribute.sign];
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
[self oneAnimationDidFinishedWithTotalCount:count]; [self oneAnimationDidFinishedWithTotalCount:count];
NSLog(@"end animation finish!"); DSLog(@"end animation finish!");
}]; }];
}else { } else {
[UIView animateWithDuration:attribute.cycleDuration delay:0 options:UIViewAnimationOptionCurveLinear | UIViewAnimationOptionRepeat animations:^{ [UIView animateWithDuration:attribute.cycleDuration delay:0 options:UIViewAnimationOptionCurveLinear | UIViewAnimationOptionRepeat animations:^{
[UIView setAnimationRepeatCount:attribute.repeatCount]; [UIView setAnimationRepeatCount:attribute.repeatCount];
[self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease) ? 10 : 0 sign:attribute.sign]; [self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease) ? 10 : 0 sign:attribute.sign];
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
NSLog(@"cycle animation finish!"); DSLog(@"cycle animation finish!");
[self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease)?0 : 10 sign:attribute.sign]; [self moveNumberCell:cell toNumber:(direction == ScrollAnimationDirectionIncrease)?0 : 10 sign:attribute.sign];
[UIView animateWithDuration:attribute.endDuration delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{ [UIView animateWithDuration:attribute.endDuration delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
[self moveNumberCell:cell toNumber:attribute.targetNumber sign:attribute.sign]; [self moveNumberCell:cell toNumber:attribute.targetNumber sign:attribute.sign];
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
[self oneAnimationDidFinishedWithTotalCount:count]; [self oneAnimationDidFinishedWithTotalCount:count];
NSLog(@"end animation finish!"); DSLog(@"end animation finish!");
}]; }];
}]; }];
} }
...@@ -434,7 +434,7 @@ static NSString * const numberCellText = @"0\n9\n8\n7\n6\n5\n4\n3\n2\n1\n0\n1\n2 ...@@ -434,7 +434,7 @@ static NSString * const numberCellText = @"0\n9\n8\n7\n6\n5\n4\n3\n2\n1\n0\n1\n2
[self moveNumberCell:cell toNumber:displayNumber sign:sign]; [self moveNumberCell:cell toNumber:displayNumber sign:sign];
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
[self oneAnimationDidFinishedWithTotalCount:count]; [self oneAnimationDidFinishedWithTotalCount:count];
NSLog(@"single animation finish!"); DSLog(@"single animation finish!");
}]; }];
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!