iOS8闪动问题修复

ChavezChen · Apr 27, 2018 · 4cdfc1f · 4cdfc1f
1 parent ce5985d
commit 4cdfc1f
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 18 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/CWLateralSlide.podspec b/CWLateralSlide.podspec
@@ -16,10 +16,10 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "CWLateralSlide"
-  s.version      = "1.5.9"
-  s.summary      = "侧滑框架."
+  s.version      = "1.6.0"
+  s.summary      = "侧滑抽屉框架."
 
-  s.description  = "一行代码集成侧滑功能."
+  s.description  = "一行代码集成侧滑抽屉功能."
 
 
   s.homepage     = "https://github.com/ChavezChen/CWLateralSlide"
@@ -74,7 +74,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/ChavezChen/CWLateralSlide.git", :tag => "1.5.9" }
+  s.source       = { :git => "https://github.com/ChavezChen/CWLateralSlide.git", :tag => "1.6.0" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

diff --git a/CWLateralSlide/CWDrawerTransition.m b/CWLateralSlide/CWDrawerTransition.m
@@ -90,7 +90,7 @@ - (void)animationViewHidden:(id <UIViewControllerContextTransitioning>)transitio
     if ([containerView.subviews.firstObject isKindOfClass:[UIImageView class]])
         backImageView = containerView.subviews.firstObject;
 
-    [UIView animateKeyframesWithDuration:[self transitionDuration:transitionContext] delay:_hiddenDelayTime options:UIViewKeyframeAnimationOptionCalculationModeCubic animations:^{
+    [UIView animateKeyframesWithDuration:[self transitionDuration:transitionContext] delay:_hiddenDelayTime options:UIViewKeyframeAnimationOptionCalculationModeLinear animations:^{
 
         [UIView addKeyframeWithRelativeStartTime:0 relativeDuration:1.0 animations:^{
             toVC.view.transform = CGAffineTransformIdentity;

diff --git a/CWLateralSlide/CWInteractiveTransition.m b/CWLateralSlide/CWInteractiveTransition.m
@@ -174,10 +174,10 @@ - (void)stopDisplayerLink {
 }
 
 - (void)cw_update {
-    if (_percent >= 1 && _toFinish) {
+    if (_percent >= 0.97 && _toFinish) {
         [self stopDisplayerLink];
         [self finishInteractiveTransition];
-    }else if (_percent <= 0 && !_toFinish) {
+    }else if (_percent <= 0.03 && !_toFinish) {
         [self stopDisplayerLink];
         [self cancelInteractiveTransition];
     }else {
@@ -186,8 +186,8 @@ - (void)cw_update {
         }else {
             _percent -= _oncePercent;
         }
-        _percent = fminf(fmaxf(_percent, 0.0), 1.0);
-        [self updateInteractiveTransition:_percent];
+        CGFloat percent = fminf(fmaxf(_percent, 0.03), 0.97);
+        [self updateInteractiveTransition:percent];
     }
 }
 

diff --git a/CWLateralSlide/CWLateralSlideConfiguration.m b/CWLateralSlide/CWLateralSlideConfiguration.m
@@ -21,6 +21,9 @@ - (instancetype)initWithDistance:(float)distance maskAlpha:(float)alpha scaleY:(
         _direction = direction;
         _backImage = backImage;
         _scaleY = scaleY;
+        _finishPercent = 0.4;
+        _showAnimDuration = 0.25;
+        _HiddenAnimDuration = 0.25;
     }
     return self;
 }
@@ -49,7 +52,7 @@ - (float)scaleY {
 
 - (float)finishPercent {
     if (_finishPercent <= 0)
-        return 0.5;
+        return 0.4;
     return _finishPercent;
 }
 

diff --git a/CWLateralSlide/UIViewController+CWLateralSlide.h b/CWLateralSlide/UIViewController+CWLateralSlide.h
@@ -12,9 +12,9 @@
 
 @interface UIViewController (CWLateralSlide)
 
-/*-----------------------------------v1.5.9-----------------------------------------*/
-/*-----------------------------------v1.5.9-----------------------------------------*/
-/*-----------------------------------v1.5.9-----------------------------------------*/
+/*-----------------------------------v1.6.0-----------------------------------------*/
+/*-----------------------------------v1.6.0-----------------------------------------*/
+/*-----------------------------------v1.6.0-----------------------------------------*/
 
 /**
  显示默认抽屉

diff --git a/CWLateralSlideDemo.xcodeproj/project.pbxproj b/CWLateralSlideDemo.xcodeproj/project.pbxproj
@@ -398,7 +398,7 @@
 				DEVELOPMENT_TEAM = ML49CE4G8Y;
 				INFOPLIST_FILE = "$(SRCROOT)/CWLateralSlideDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.Chavez.CWLateralSlide;
+				PRODUCT_BUNDLE_IDENTIFIER = com.Chavez.CWLateralSlide11;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -410,7 +410,7 @@
 				DEVELOPMENT_TEAM = ML49CE4G8Y;
 				INFOPLIST_FILE = "$(SRCROOT)/CWLateralSlideDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.Chavez.CWLateralSlide;
+				PRODUCT_BUNDLE_IDENTIFIER = com.Chavez.CWLateralSlide11;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

diff --git a/...codeproj/project.xcworkspace/xcuserdata/chavez.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/chavez.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/CWLateralSlideDemo/Clasess/ViewController.m b/CWLateralSlideDemo/Clasess/ViewController.m
@@ -56,7 +56,7 @@ - (void)leftClick {
     // 自己随心所欲创建的一个控制器
     LeftViewController *vc = [[LeftViewController alloc] init];
 
-    // 这个代码与框架无关，与demo相关，因为有兄弟在侧滑出来的界面，使用present到另一个界面返回的时候会有异常，这里提供各个场景的解决方式，需要在侧滑的界面present的同学可以借鉴一下！处理方式在leftViewController的viewDidAppear:方法内
+    // 这个代码与框架无关，与demo相关，因为有兄弟在侧滑出来的界面，使用present到另一个界面返回的时候会有异常，这里提供各个场景的解决方式，需要在侧滑的界面present的同学可以借鉴一下！处理方式在leftViewController的viewDidAppear:方法内,或者直接用cw_presentViewController
     // 另外一种方式 直接使用 cw_presentViewController:方法也可以，两个方法的表示形式有点差异
     vc.drawerType = DrawerDefaultLeft; // 为了表示各种场景才加上这个判断，如果只有单一场景这行代码完全不需要
 
@@ -114,7 +114,7 @@ - (void)drawerMaskAnimationLeft{
 
     // 这个代码与框架无关，与demo相关，因为有兄弟在侧滑出来的界面，使用present到另一个界面返回的时候会有异常，这里提供各个场景的解决方式，需要在侧滑的界面present的同学可以借鉴一下！处理方式在leftViewController的viewDidAppear:方法内
     vc.drawerType = DrawerTypeMaskLeft;
-    
+
     // 调用这个方法
     [self cw_showDrawerViewController:vc animationType:CWDrawerAnimationTypeMask configuration:nil];
 }

diff --git a/CWLateralSlideDemo/Info.plist b/CWLateralSlideDemo/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.9</string>
+	<string>1.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>