优化调整了部分代码

iosdeveloperpanc · Jun 21, 2017 · 666798b · 666798b
1 parent 12c4448
commit 666798b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/PanC.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/PanC.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/PCGestureUnlock/FrameWork/PCCircle.m b/PCGestureUnlock/FrameWork/PCCircle.m
@@ -49,7 +49,7 @@ - (void)drawRect:(CGRect)rect {
 
     if (self.type == CircleTypeGesture) {
         radio = CircleRadio;
-    } else if (self.type == CircleTypeInfo) {
+    } else {
         radio = 1;
     }
 

diff --git a/PCGestureUnlock/FrameWork/PCCircleView.m b/PCGestureUnlock/FrameWork/PCCircleView.m
@@ -550,11 +550,11 @@ -(void)calAngleAndconnectTheJumpedCircle{
 #pragma mark - 提供两个点，返回一个它们的中点
 - (CGPoint)centerPointWithPointOne:(CGPoint)pointOne pointTwo:(CGPoint)pointTwo
 {
-    CGFloat x1 = pointOne.x > pointTwo.x ? pointOne.x : pointTwo.x;
-    CGFloat x2 = pointOne.x < pointTwo.x ? pointOne.x : pointTwo.x;
-    CGFloat y1 = pointOne.y > pointTwo.y ? pointOne.y : pointTwo.y;
-    CGFloat y2 = pointOne.y < pointTwo.y ? pointOne.y : pointTwo.y;
-    
+    CGFloat x1 = fmax(pointOne.x, pointTwo.x);
+    CGFloat x2 = fmin(pointOne.x, pointTwo.x);
+    CGFloat y1 = fmax(pointOne.y, pointTwo.y);
+    CGFloat y2 = fmin(pointOne.y, pointTwo.y);
+
     return CGPointMake((x1+x2)/2, (y1 + y2)/2);
 }
 

diff --git a/PCGestureUnlock/View/PCCircleInfoView.m b/PCGestureUnlock/View/PCCircleInfoView.m
@@ -13,7 +13,7 @@ @implementation PCCircleInfoView
 - (instancetype)init
 {
     if (self = [super init]) {
-        // 解锁视图准备
+        // 解锁视图
         [self lockViewPrepare];
     }
     return self;
@@ -22,14 +22,14 @@ - (instancetype)init
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
     if (self = [super initWithCoder:aDecoder]) {
-        // 解锁视图准备
+        // 解锁视图
         [self lockViewPrepare];
     }
     return self;
 }
 
 /*
- *  解锁视图准备
+ *  解锁视图
  */
 -(void)lockViewPrepare{
 

diff --git a/PCGestureUnlock/View/PCLockLabel.h b/PCGestureUnlock/View/PCLockLabel.h
@@ -8,17 +8,17 @@
 /*
  *  普通提示信息
  */
--(void)showNormalMsg:(NSString *)msg;
+- (void)showNormalMsg:(NSString *)msg;
 
 
 /*
  *  警示信息
  */
--(void)showWarnMsg:(NSString *)msg;
+- (void)showWarnMsg:(NSString *)msg;
 
 /*
  *  警示信息(shake)
  */
--(void)showWarnMsgAndShake:(NSString *)msg;
+- (void)showWarnMsgAndShake:(NSString *)msg;
 
 @end
diff --git a/PCGestureUnlock/View/PCLockLabel.m b/PCGestureUnlock/View/PCLockLabel.m
@@ -6,7 +6,7 @@
 @implementation PCLockLabel
 
 
--(instancetype)initWithFrame:(CGRect)frame{
+- (instancetype)initWithFrame:(CGRect)frame{
 
     self = [super initWithFrame:frame];
 
@@ -21,7 +21,7 @@ -(instancetype)initWithFrame:(CGRect)frame{
 
 
 
--(id)initWithCoder:(NSCoder *)aDecoder{
+- (instancetype)initWithCoder:(NSCoder *)aDecoder{
 
     self=[super initWithCoder:aDecoder];
 
@@ -38,7 +38,7 @@ -(id)initWithCoder:(NSCoder *)aDecoder{
 /*
  *  视图初始化
  */
--(void)viewPrepare{
+- (void)viewPrepare{
 
     [self setFont:[UIFont systemFontOfSize:14.0f]];
     [self setTextAlignment:NSTextAlignmentCenter];
@@ -48,7 +48,7 @@ -(void)viewPrepare{
 /*
  *  普通提示信息
  */
--(void)showNormalMsg:(NSString *)msg{
+- (void)showNormalMsg:(NSString *)msg{
 
     [self setText:msg];
     [self setTextColor:textColorNormalState];
@@ -57,7 +57,7 @@ -(void)showNormalMsg:(NSString *)msg{
 /*
  *  警示信息
  */
--(void)showWarnMsg:(NSString *)msg{
+- (void)showWarnMsg:(NSString *)msg{
 
     [self setText:msg];
     [self setTextColor:textColorWarningState];
@@ -66,7 +66,7 @@ -(void)showWarnMsg:(NSString *)msg{
 /*
  *  警示信息(shake)
  */
--(void)showWarnMsgAndShake:(NSString *)msg{
+- (void)showWarnMsgAndShake:(NSString *)msg{
 
     [self setText:msg];
     [self setTextColor:textColorWarningState];