优化代码命名规范

Author: jkpang

PPCounter.xcodeproj/project.xcworkspace/xcuserdata/AndyPang.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,25 +23,28 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0.00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QYj-f0-roe">
+                                <rect key="frame" x="16" y="150" width="104" height="25.5"/>
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="21"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="2tx-dz-plT">
+                                <rect key="frame" x="34" y="489" width="307" height="29"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="28" id="iVb-Rv-cQH"/>
                                 </constraints>
                                 <segments>
-                                    <segment title="EaseOut"/>
-                                    <segment title="EaseIn"/>
                                     <segment title="EaseInOut"/>
+                                    <segment title="EaseIn"/>
+                                    <segment title="EaseOut"/>
                                     <segment title="Linear"/>
                                 </segments>
                                 <connections>
                                     <action selector="select:" destination="BYZ-38-t0r" eventType="valueChanged" id="r2C-rG-gB6"/>
                                 </connections>
                             </segmentedControl>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AnimationType" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8p5-nc-4Br">
+                                <rect key="frame" x="131" y="460" width="113" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="d81-X2-LbJ"/>
                                     <constraint firstAttribute="width" constant="113" id="zco-36-HaF"/>
@@ -48,16 +54,19 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="owm-PJ-2ja">
+                                <rect key="frame" x="137" y="150" width="101" height="25.5"/>
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L1G-G9-9Op">
+                                <rect key="frame" x="255" y="150" width="104" height="25.5"/>
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UILabel" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dOX-9J-s4y">
+                                <rect key="frame" x="158.5" y="109" width="58" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="58" id="6RB-7e-edG"/>
                                     <constraint firstAttribute="height" constant="21" id="Mlg-ha-0YW"/>
@@ -67,21 +76,25 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z3a-4n-2tv">
+                                <rect key="frame" x="254.5" y="255.5" width="104.5" height="35"/>
                                 <color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <state key="normal" title="¥0"/>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tdn-4x-gQz">
+                                <rect key="frame" x="135.5" y="255.5" width="104" height="35"/>
                                 <color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <state key="normal" title="0%"/>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cuo-R9-WlN">
+                                <rect key="frame" x="16" y="255.5" width="104.5" height="35"/>
                                 <color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <state key="normal" title="0.00"/>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UIButton" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eE2-4r-mcg">
+                                <rect key="frame" x="153.5" y="209.5" width="68" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="68" id="CER-1W-eVK"/>
                                     <constraint firstAttribute="height" constant="21" id="IMb-bU-ydx"/>

PPCounter/Base.lproj/Main.storyboard

@@ -27,7 +27,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-UIKIT_EXTERN NSString *const kPPCounterAnimationType;
+UIKIT_EXTERN NSString *const kPPCounterAnimationOptions;
 
 typedef void(^PPCompletionBlock)(void);
 
@@ -37,13 +37,16 @@ typedef NSString *(^PPFormatBlock)(CGFloat number);
 
 typedef NSAttributedString *(^PPAttributedFormatBlock)(CGFloat number);
 
-typedef NS_ENUM(NSUInteger, PPCounterAnimationType) {
-    /** 由快到慢*/
-    PPCounterAnimationTypeEaseOut = 1,
-    /** 由慢到快*/
-    PPCounterAnimationTypeEaseIn,
+typedef NS_ENUM(NSUInteger, PPCounterAnimationOptions) {
     /** 由慢到快,再由快到慢*/
-    PPCounterAnimationTypeEaseInOut,
+    PPCounterAnimationOptionCurveEaseInOut = 1,
+    /** 由慢到快*/
+    PPCounterAnimationOptionCurveEaseIn,
+    /** 由快到慢*/
+    PPCounterAnimationOptionCurveEaseOut,
     /** 匀速*/
-    PPCounterAnimationTypeLinear
+    PPCounterAnimationOptionCurveLinear
 };
+
+
+

PPCounter/PPCounter/PPCounterConst.h

@@ -8,4 +8,4 @@
 
 #import "PPCounterConst.h"
 
-NSString *const kPPCounterAnimationType = @"kPPCounterAnimationType";
+NSString *const kPPCounterAnimationOptions = @"kPPCounterAnimationOptions";

PPCounter/PPCounter/PPCounterConst.m

@@ -37,18 +37,18 @@
 /**
  在指定时间内数字从 numberA -> numberB
 
- @param starNumer       开始的数字
- @param endNumber       结束的数字
- @param duration        指定的时间
- @param animationType   动画类型
- @param numberBlock     当前数字的回调
- @param completionBlock 已完成的回调
+ @param starNumer           开始的数字
+ @param endNumber           结束的数字
+ @param duration            指定的时间
+ @param animationOptions    动画类型
+ @param currentNumber       当前数字的回调
+ @param completion          已完成的回调
  */
 - (void)fromNumber:(CGFloat)starNumer
           toNumber:(CGFloat)endNumber
           duration:(CFTimeInterval)duration
-     animationType:(PPCounterAnimationType)animationType
-     currentNumber:(PPCurrentNumberBlock)numberBlock
-          complete:(PPCompletionBlock)completionBlock;
+  animationOptions:(PPCounterAnimationOptions)animationOptions
+     currentNumber:(PPCurrentNumberBlock)currentNumber
+        completion:(PPCompletionBlock)completion;
 
 @end

PPCounter/PPCounter/PPCounterEngine.h

@@ -29,9 +29,9 @@ @interface PPCounterEngine ()
 @property (nonatomic, assign) CFTimeInterval progressTime;
 
 /** 获取当前数字的Block*/
-@property (nonatomic, copy) PPCurrentNumberBlock numberBlock;
+@property (nonatomic, copy) PPCurrentNumberBlock currentNumber;
 /** 计数完成的Block*/
-@property (nonatomic, copy) PPCompletionBlock completionBlock;
+@property (nonatomic, copy) PPCompletionBlock completion;
 
 /** 动画函数*/
 @property PPCurrentBufferFunction currentBufferFunction;
@@ -44,7 +44,7 @@ - (instancetype)init
 {
     if (self = [super init])
     {
-        _currentBufferFunction = PPBufferFunctionEaseOut;
+        _currentBufferFunction = PPBufferFunctionEaseInOut;
     }
     return self;
 }
@@ -57,9 +57,9 @@ + (instancetype)counterEngine
 - (void)fromNumber:(CGFloat)starNumer
           toNumber:(CGFloat)endNumber
           duration:(CFTimeInterval)durationTime
-     animationType:(PPCounterAnimationType)animationType
-     currentNumber:(PPCurrentNumberBlock)numberBlock
-          complete:(PPCompletionBlock)completionBlock
+  animationOptions:(PPCounterAnimationOptions)animationOptions
+     currentNumber:(PPCurrentNumberBlock)currentNumber
+        completion:(PPCompletionBlock)completion
 {
     // 开始前清空定时器
     [self cleanTimer];
@@ -70,11 +70,11 @@ - (void)fromNumber:(CGFloat)starNumer
     _durationTime = durationTime;
 
     // 设置缓冲动画类型
-    [self setAnimationType:animationType];
+    [self setanimationOptions:animationOptions];
 
     // 设置block回调函数
-    numberBlock ? _numberBlock = numberBlock : nil ;
-    completionBlock ? _completionBlock = completionBlock : nil ;
+    currentNumber ? _currentNumber = currentNumber : nil ;
+    completion ? _completion = completion : nil ;
 
     // 记录定时器运行前的时间
     _lastTime = CACurrentMediaTime();
@@ -99,28 +99,27 @@ - (void)changeNumber
     if (_progressTime >= _durationTime)
     {
         [self cleanTimer];
-        _numberBlock ? _numberBlock(_endNumber) : nil ;
-        _completionBlock ? _completionBlock() : nil ;
+        _currentNumber ? _currentNumber(_endNumber) : nil ;
+        _completion ? _completion() : nil ;
         return;
     }
-    _numberBlock ? _numberBlock([self computeNumber]) : nil ;
-    
+    _currentNumber ? _currentNumber([self computeNumber]) : nil ;
 }
 
-- (void)setAnimationType:(PPCounterAnimationType)animationType
+- (void)setanimationOptions:(PPCounterAnimationOptions)animationOptions
 {
-    switch (animationType)
+    switch (animationOptions)
     {
-        case PPCounterAnimationTypeEaseOut:
-            _currentBufferFunction = PPBufferFunctionEaseOut;
+        case PPCounterAnimationOptionCurveEaseInOut:
+            _currentBufferFunction = PPBufferFunctionEaseInOut;
             break;
-        case PPCounterAnimationTypeEaseIn:
+        case PPCounterAnimationOptionCurveEaseIn:
             _currentBufferFunction = PPBufferFunctionEaseIn;
             break;
-        case PPCounterAnimationTypeEaseInOut:
-            _currentBufferFunction = PPBufferFunctionEaseInOut;
+        case PPCounterAnimationOptionCurveEaseOut:
+            _currentBufferFunction = PPBufferFunctionEaseOut;
             break;
-        case PPCounterAnimationTypeLinear:
+        case PPCounterAnimationOptionCurveLinear:
             _currentBufferFunction = PPBufferFunctionLinear;
             break;
         default: