Merge pull request EFPrefix#3 from rwinzhang/master

Fix timer fps on iOS10 and crash when calling countFromCurrentValueTo
Kirow · May 24, 2017 · f9e3713 · f9e3713
2 parents 4712d0f + 20b036c
commit f9e3713
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/EFCountingLabel/Classes/EFCountingLabel.swift b/EFCountingLabel/Classes/EFCountingLabel.swift
@@ -79,7 +79,7 @@ public class EFCountingLabel: UILabel {
 
     private var startingValue: CGFloat!
     private var destinationValue: CGFloat!
-    private var progress: TimeInterval!
+    private var progress: TimeInterval = 0
     private var lastUpdate: TimeInterval!
     private var totalTime: TimeInterval!
     private var easingRate: CGFloat!
@@ -128,7 +128,7 @@ public class EFCountingLabel: UILabel {
 
         let timer = CADisplayLink(target: self, selector: #selector(EFCountingLabel.updateValue(_:)))
         if #available(iOS 10.0, *) {
-            timer.preferredFramesPerSecond = 2
+            timer.preferredFramesPerSecond = 30
         } else {
             timer.frameInterval = 2
         }
@@ -154,7 +154,9 @@ public class EFCountingLabel: UILabel {
     }
 
     public func currentValue() -> CGFloat {
-        if self.progress >= self.totalTime {
+        if self.progress == 0 {
+            return 0
+        } else if self.progress >= self.totalTime {
             return self.destinationValue
         }