Skip to content

Commit 5600ae4

Browse files
jkpangjkpang
committed
1. [NSDate timeIntervalSinceReferenceDate] -> CACurrentMediaTime()
2. NSTimeInterval ->CFTimeInterval
1 parent 8371ea4 commit 5600ae4

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

‎PPCounter MacOSDemo/PPCounter MacOSDemo.xcodeproj/project.xcworkspace/xcuserdata/duoyi.xcuserdatad/UserInterfaceState.xcuserstate

1.04 KB
Binary file not shown.

‎PPCounter.xcworkspace/xcuserdata/duoyi.xcuserdatad/UserInterfaceState.xcuserstate

1.15 KB
Binary file not shown.

‎PPCounter/Core/PPCounterEngine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
- (void)fromNumber:(CGFloat)starNumer
4848
toNumber:(CGFloat)endNumber
49-
duration:(NSTimeInterval)duration
49+
duration:(CFTimeInterval)duration
5050
animationOptions:(PPCounterAnimationOptions)animationOptions
5151
currentNumber:(PPCurrentNumberBlock)currentNumber
5252
completion:(PPCompletionBlock)completion;

‎PPCounter/Core/PPCounterEngine.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#if TARGET_OS_IPHONE
2929
#import <UIKit/UIKit.h>
3030
#elif TARGET_OS_MAC
31-
#import <CoreGraphics/CoreGraphics.h>
31+
#import <Cocoa/Cocoa.h>
3232
#endif
3333

3434
/** 函数指针*/
@@ -49,11 +49,11 @@ @interface PPCounterEngine ()
4949
@property (nonatomic, assign) CGFloat endNumber;
5050

5151
/** 动画的总持续时间*/
52-
@property (nonatomic, assign) NSTimeInterval durationTime;
52+
@property (nonatomic, assign) CFTimeInterval durationTime;
5353
/** 记录上一帧动画的时间*/
54-
@property (nonatomic, assign) NSTimeInterval lastTime;
54+
@property (nonatomic, assign) CFTimeInterval lastTime;
5555
/** 记录动画已持续的时间*/
56-
@property (nonatomic, assign) NSTimeInterval progressTime;
56+
@property (nonatomic, assign) CFTimeInterval progressTime;
5757

5858
/** 获取当前数字的Block*/
5959
@property (nonatomic, copy) PPCurrentNumberBlock currentNumber;
@@ -82,7 +82,7 @@ + (instancetype)counterEngine
8282

8383
- (void)fromNumber:(CGFloat)starNumer
8484
toNumber:(CGFloat)endNumber
85-
duration:(NSTimeInterval)durationTime
85+
duration:(CFTimeInterval)durationTime
8686
animationOptions:(PPCounterAnimationOptions)animationOptions
8787
currentNumber:(PPCurrentNumberBlock)currentNumber
8888
completion:(PPCompletionBlock)completion
@@ -110,7 +110,7 @@ - (void)fromNumber:(CGFloat)starNumer
110110
completion ? _completion = completion : nil ;
111111

112112
// 记录定时器运行前的时间
113-
_lastTime = [NSDate timeIntervalSinceReferenceDate];
113+
_lastTime = CACurrentMediaTime();
114114

115115
// 实例化定时器
116116
#if TARGET_OS_IPHONE
@@ -129,7 +129,7 @@ - (void)fromNumber:(CGFloat)starNumer
129129
- (void)changeNumber
130130
{
131131
// 1.记录当前动画开始的时间
132-
NSTimeInterval thisTime = [NSDate timeIntervalSinceReferenceDate];
132+
CFTimeInterval thisTime = CACurrentMediaTime();
133133
// 2.计算动画已持续的时间量
134134
_progressTime = _progressTime + (thisTime - _lastTime);
135135
// 3.准备下一次的计算

‎PPCounter/UIKit/UIButton+PPCounter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
*/
4545
- (void)pp_fromNumber:(CGFloat)numberA
4646
toNumber:(CGFloat)numberB
47-
duration:(NSTimeInterval)duration
47+
duration:(CFTimeInterval)duration
4848
format:(PPFormatBlock)format;
4949

5050
/**
@@ -59,7 +59,7 @@
5959
*/
6060
- (void)pp_fromNumber:(CGFloat)numberA
6161
toNumber:(CGFloat)numberB
62-
duration:(NSTimeInterval)duration
62+
duration:(CFTimeInterval)duration
6363
format:(PPFormatBlock)format
6464
completion:(PPCompletionBlock)completion;
6565

@@ -77,7 +77,7 @@
7777
*/
7878
- (void)pp_fromNumber:(CGFloat)numberA
7979
toNumber:(CGFloat)numberB
80-
duration:(NSTimeInterval)duration
80+
duration:(CFTimeInterval)duration
8181
animationOptions:(PPCounterAnimationOptions)animationOptions
8282
format:(PPFormatBlock)format
8383
completion:(PPCompletionBlock)completion;
@@ -95,7 +95,7 @@
9595
*/
9696
- (void)pp_fromNumber:(CGFloat)numberA
9797
toNumber:(CGFloat)numberB
98-
duration:(NSTimeInterval)duration
98+
duration:(CFTimeInterval)duration
9999
attributedFormat:(PPAttributedFormatBlock)attributedFormat;
100100

101101
/**
@@ -110,7 +110,7 @@
110110
*/
111111
- (void)pp_fromNumber:(CGFloat)numberA
112112
toNumber:(CGFloat)numberB
113-
duration:(NSTimeInterval)duration
113+
duration:(CFTimeInterval)duration
114114
attributedFormat:(PPAttributedFormatBlock)attributedFormat
115115
completion:(PPCompletionBlock)completion;
116116

@@ -128,7 +128,7 @@
128128
*/
129129
- (void)pp_fromNumber:(CGFloat)numberA
130130
toNumber:(CGFloat)numberB
131-
duration:(NSTimeInterval)duration
131+
duration:(CFTimeInterval)duration
132132
animationOptions:(PPCounterAnimationOptions)animationOptions
133133
attributedFormat:(PPAttributedFormatBlock)attributedFormat
134134
completion:(PPCompletionBlock)completion;

‎PPCounter/UIKit/UIButton+PPCounter.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@
2929

3030
@implementation UIButton (PPCounter)
3131

32-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format
32+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format
3333
{
3434
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:nil];
3535
}
3636

37-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
37+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
3838
{
3939
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:completion];
4040
}
4141

42-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
42+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
4343
{
4444

4545
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:nil];
4646
}
4747

48-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
48+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
4949
{
5050
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:completion];
5151
}
5252

5353
#pragma mark - normal font
5454
- (void)pp_fromNumber:(CGFloat)numberA
5555
toNumber:(CGFloat)numberB
56-
duration:(NSTimeInterval)duration
56+
duration:(CFTimeInterval)duration
5757
animationOptions:(PPCounterAnimationOptions)animationOptions
5858
format:(PPFormatBlock)format
5959
completion:(PPCompletionBlock)completion
@@ -71,7 +71,7 @@ - (void)pp_fromNumber:(CGFloat)numberA
7171
#pragma mark - attributed font
7272
- (void)pp_fromNumber:(CGFloat)numberA
7373
toNumber:(CGFloat)numberB
74-
duration:(NSTimeInterval)duration
74+
duration:(CFTimeInterval)duration
7575
animationOptions:(PPCounterAnimationOptions)animationOptions
7676
attributedFormat:(PPAttributedFormatBlock)attributedFormat
7777
completion:(PPCompletionBlock)completion

‎PPCounter/UIKit/UILabel+PPCounter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
- (void)pp_fromNumber:(CGFloat)numberA
4747
toNumber:(CGFloat)numberB
48-
duration:(NSTimeInterval)duration
48+
duration:(CFTimeInterval)duration
4949
format:(PPFormatBlock)format;
5050

5151
/**
@@ -60,7 +60,7 @@
6060
*/
6161
- (void)pp_fromNumber:(CGFloat)numberA
6262
toNumber:(CGFloat)numberB
63-
duration:(NSTimeInterval)duration
63+
duration:(CFTimeInterval)duration
6464
format:(PPFormatBlock)format
6565
completion:(PPCompletionBlock)completion;
6666

@@ -78,7 +78,7 @@
7878
*/
7979
- (void)pp_fromNumber:(CGFloat)numberA
8080
toNumber:(CGFloat)numberB
81-
duration:(NSTimeInterval)duration
81+
duration:(CFTimeInterval)duration
8282
animationOptions:(PPCounterAnimationOptions)animationOptions
8383
format:(PPFormatBlock)format
8484
completion:(PPCompletionBlock)completion;
@@ -96,7 +96,7 @@
9696
*/
9797
- (void)pp_fromNumber:(CGFloat)numberA
9898
toNumber:(CGFloat)numberB
99-
duration:(NSTimeInterval)duration
99+
duration:(CFTimeInterval)duration
100100
attributedFormat:(PPAttributedFormatBlock)attributedFormat;
101101

102102
/**
@@ -112,7 +112,7 @@
112112

113113
- (void)pp_fromNumber:(CGFloat)numberA
114114
toNumber:(CGFloat)numberB
115-
duration:(NSTimeInterval)duration
115+
duration:(CFTimeInterval)duration
116116
attributedFormat:(PPAttributedFormatBlock)attributedFormat
117117
completion:(PPCompletionBlock)completion;
118118

@@ -130,7 +130,7 @@
130130
*/
131131
- (void)pp_fromNumber:(CGFloat)numberA
132132
toNumber:(CGFloat)numberB
133-
duration:(NSTimeInterval)duration
133+
duration:(CFTimeInterval)duration
134134
animationOptions:(PPCounterAnimationOptions)animationOptions
135135
attributedFormat:(PPAttributedFormatBlock)attributedFormat
136136
completion:(PPCompletionBlock)completion;

‎PPCounter/UIKit/UILabel+PPCounter.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@
2929

3030
@implementation UILabel (PPCounter)
3131

32-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format
32+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format
3333
{
3434
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:nil];
3535
}
3636

37-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
37+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
3838
{
3939
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:completion];
4040
}
4141

42-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
42+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
4343
{
4444

4545
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:nil];
4646
}
4747

48-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
48+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
4949
{
5050
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:completion];
5151
}
5252

5353
#pragma mark - normal font
5454
- (void)pp_fromNumber:(CGFloat)numberA
5555
toNumber:(CGFloat)numberB
56-
duration:(NSTimeInterval)duration
56+
duration:(CFTimeInterval)duration
5757
animationOptions:(PPCounterAnimationOptions)animationOptions
5858
format:(PPFormatBlock)format
5959
completion:(PPCompletionBlock)completion
@@ -71,7 +71,7 @@ - (void)pp_fromNumber:(CGFloat)numberA
7171
#pragma mark - attributed font
7272
- (void)pp_fromNumber:(CGFloat)numberA
7373
toNumber:(CGFloat)numberB
74-
duration:(NSTimeInterval)duration
74+
duration:(CFTimeInterval)duration
7575
animationOptions:(PPCounterAnimationOptions)animationOptions
7676
attributedFormat:(PPAttributedFormatBlock)attributedFormat
7777
completion:(PPCompletionBlock)completion

0 commit comments

Comments
 (0)