一些细节的优化

bestswifter · bestswifter · commit 4f668dbfb5ff · 2016-02-11T13:34:45.000+08:00
diff --git a/CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Cross Dissolve/HalfWaySpringAnimator.swift b/CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Cross Dissolve/HalfWaySpringAnimator.swift
@@ -12,7 +12,7 @@ import UIKit
 class HalfWaySpringAnimator: NSObject, UIViewControllerAnimatedTransitioning {
     /// 设置动画的持续时间
     func transitionDuration(transitionContext: UIViewControllerContextTransitioning?) -> NSTimeInterval {
-        return 1
+        return 2
     }
     
     /// 设置动画的进行方式，附有详细注释，demo中其他地方的这个方法不再解释
diff --git a/CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Custom Presentation/CustomPresentationController.swift b/CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Custom Presentation/CustomPresentationController.swift
@@ -12,7 +12,7 @@ class CustomPresentationController: UIPresentationController, UIViewControllerTr
     
     let CORNER_RADIUS: CGFloat = 16
     var presentationWrappingView: UIView? = nil // 被添加动画效果的view，在presentedViewController的基础上添加了其他效果
-    var dimmingView: UIView? = nil
+    var dimmingView: UIView? = nil  // alpha为0.5的黑色蒙版
     
     override init(presentedViewController: UIViewController, presentingViewController: UIViewController) {
         super.init(presentedViewController: presentedViewController, presentingViewController: presentingViewController)
diff --git a/CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Custom Presentation/CustomPresentationFirstViewController.swift b/CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Custom Presentation/CustomPresentationFirstViewController.swift
@@ -15,6 +15,8 @@ class CustomPresentationFirstViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupView() // 主要是一些UI控件的布局，可以无视其实现细节
+        
+        customPresentationSecondViewController.transitioningDelegate = customPresentationController
     }
 
     override func didReceiveMemoryWarning() {
@@ -26,7 +28,6 @@ class CustomPresentationFirstViewController: UIViewController {
 // MARK: - UI事件处理
 extension CustomPresentationFirstViewController {
     func animationButtonDidClicked() {
-        customPresentationSecondViewController.transitioningDelegate = customPresentationController
         self.presentViewController(customPresentationSecondViewController, animated: true, completion: nil)
     }
     

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import UIKit`
`12`	`12`	`class HalfWaySpringAnimator: NSObject, UIViewControllerAnimatedTransitioning {`
`13`	`13`	`/// 设置动画的持续时间`
`14`	`14`	`func transitionDuration(transitionContext: UIViewControllerContextTransitioning?) -> NSTimeInterval {`
`15`		`- return 1`
	`15`	`+ return 2`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/// 设置动画的进行方式，附有详细注释，demo中其他地方的这个方法不再解释`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ class CustomPresentationFirstViewController: UIViewController {`
`15`	`15`	`override func viewDidLoad() {`
`16`	`16`	`super.viewDidLoad()`
`17`	`17`	`setupView() // 主要是一些UI控件的布局，可以无视其实现细节`
	`18`	`+`
	`19`	`+ customPresentationSecondViewController.transitioningDelegate = customPresentationController`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`override func didReceiveMemoryWarning() {`
`@@ -26,7 +28,6 @@ class CustomPresentationFirstViewController: UIViewController {`
`26`	`28`	`// MARK: - UI事件处理`
`27`	`29`	`extension CustomPresentationFirstViewController {`
`28`	`30`	`func animationButtonDidClicked() {`
`29`		`- customPresentationSecondViewController.transitioningDelegate = customPresentationController`
`30`	`31`	`self.presentViewController(customPresentationSecondViewController, animated: true, completion: nil)`
`31`	`32`	`}`
`32`	`33`