fix animation pause and unpause glitch

Alex1989Wang · Mar 22, 2018 · c375d5a · c375d5a
1 parent c7fbaf6
commit c375d5a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/JWWaveView.podspec b/JWWaveView.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'JWWaveView'
-  s.version          = '0.2.1'
+  s.version          = '0.2.2'
   s.summary          = 'Providing a water waving effect for any of your UIView instance.'
 
 # This description is used to generate tags and improve search results.

diff --git a/JWWaveView/Classes/JWWaveView.m b/JWWaveView/Classes/JWWaveView.m
@@ -36,10 +36,12 @@ - (void)startWavingIfNeeded {
 }
 
 - (void)pauseWavingIfNeeded {
-    CFTimeInterval currentTime = CACurrentMediaTime();
-    CFTimeInterval layerPausedTimestamp = [self.waveShapeLayer convertTime:currentTime toLayer:nil];
-    self.waveShapeLayer.timeOffset = layerPausedTimestamp;
-    self.waveShapeLayer.speed = 0;
+    if ([self.waveShapeLayer animationForKey:kWaveShapeTranslationAnimationKey]) {
+        CFTimeInterval currentTime = CACurrentMediaTime();
+        CFTimeInterval layerPausedTimestamp = [self.waveShapeLayer convertTime:currentTime fromLayer:nil];
+        self.waveShapeLayer.speed = 0;
+        self.waveShapeLayer.timeOffset = layerPausedTimestamp;
+    }
 }
 
 #pragma mark - Initialization
@@ -110,7 +112,7 @@ - (void)restartWaveShapeTranslation {
         self.waveShapeLayer.beginTime = 0;
         self.waveShapeLayer.timeOffset = 0;
         CFTimeInterval currentTime = CACurrentMediaTime();
-        CFTimeInterval layerTimestamp = [self.waveShapeLayer convertTime:currentTime toLayer:nil];
+        CFTimeInterval layerTimestamp = [self.waveShapeLayer convertTime:currentTime fromLayer:nil];
         CFTimeInterval timeOffsetSincePaused = layerTimestamp - previousTimeOffset;
         self.waveShapeLayer.beginTime = timeOffsetSincePaused;
     }