tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:AnimatinSet on iOS use AnimationGroup

Browse Source
This commit is contained in:
pengfei.zhou
2019-12-02 11:01:56 +08:00
parent ebfcbdec15
commit a94ed4d880
4 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
iOS/Pod/Classes/Shader/DoricViewNode.m
View File

@@ -317,6 +317,14 @@ - (void)doAnimation:(id)params withPromise:(DoricPromise *)promise {
[self.view.layer addAnimation:animation forKey:nil];
}
- (CFTimeInterval)computeDurationOfAnimations:(NSArray<CAAnimation *> *)animations {
__block CFTimeInterval interval = 0;
[animations forEach:^(CAAnimation *obj) {
interval = MAX(interval, obj.beginTime + obj.duration * (1 + obj.repeatCount));
}];
return interval;
}
- (CAAnimation *)parseAnimation:(id)params {
if ([params isKindOfClass:[NSArray class]]) {
NSArray *anims = params;
@@ -325,6 +333,7 @@ - (CAAnimation *)parseAnimation:(id)params {
[anims forEach:^(id obj) {
[animations addObject:[self parseAnimation:obj]];
}];
animationGroup.duration = [self computeDurationOfAnimations:animations];
animationGroup.animations = animations;
return animationGroup;
} else if ([params isKindOfClass:[NSDictionary class]]) {
@@ -346,6 +355,7 @@ - (CAAnimation *)parseAnimation:(id)params {
}];
animation.fromValue = [NSValue valueWithCGPoint:from];
animation.toValue = [NSValue valueWithCGPoint:to];
[self setAnimation:animation params:params];
return animation;
} else {
CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
@@ -354,19 +364,34 @@ - (CAAnimation *)parseAnimation:(id)params {
[animations addObject:[self parseChangeable:obj]];
}];
animationGroup.animations = animations;
animationGroup.duration = [params[@"duration"] floatValue] / 1000;
if (params[@"delay"]) {
animationGroup.beginTime = CACurrentMediaTime() + [params[@"delay"] floatValue] / 1000;
}
[self setAnimation:animationGroup params:params];
return animationGroup;
}
}
return nil;
}
- (void)setAnimation:(CAAnimation *)animation params:(NSDictionary *)params {
if (params[@"repeatCount"]) {
NSInteger repeatCount = [params[@"repeatCount"] integerValue];
if (repeatCount < 0) {
repeatCount = NSNotFound;
}
animation.repeatCount = repeatCount;
}
if (params[@"repeatMode"]) {
NSInteger repeatMode = [params[@"repeatMode"] integerValue];
animation.autoreverses = repeatMode == 2;
}
if (params[@"delay"]) {
animation.beginTime = [params[@"delay"] floatValue] / 1000;
}
animation.duration = [params[@"duration"] floatValue] / 1000;
animation.removedOnCompletion = NO;
animation.fillMode = kCAFillModeForwards;
}
- (CAAnimation *)parseChangeable:(NSDictionary *)params {
NSString *key = params[@"key"];
CABasicAnimation *animation = [CABasicAnimation animation];
@@ -387,17 +412,6 @@ - (CAAnimation *)parseChangeable:(NSDictionary *)params {
animation.fromValue = params[@"fromValue"];
animation.toValue = params[@"toValue"];
}
if (params[@"repeatCount"]) {
NSInteger repeatCount = [params[@"repeatCount"] integerValue];
if (repeatCount < 0) {
repeatCount = NSNotFound;
}
animation.repeatCount = repeatCount;
}
if (params[@"repeatMode"]) {
NSInteger repeatMode = [params[@"repeatMode"] integerValue];
animation.autoreverses = repeatMode == 2;
}
return animation;
}