交互式动画功能实现

Author: bestswifter

CustomTransition/CustomTransition-Swift/CustomTransition-Swift.xcodeproj/project.pbxproj

@@ -109,10 +109,10 @@
 			isa = PBXGroup;
 			children = (
 				9B5075091C68D94400C89416 /* InteractivityFirstViewController.swift */,
+				9B50750B1C68D95600C89416 /* InteractivitySecondViewController.swift */,
 				9B50750D1C68EC1D00C89416 /* InteractivityTransitionDelegate.swift */,
 				9B50750F1C68EC8C00C89416 /* InteractivityTransitionAnimator.swift */,
 				9B5075111C68F08C00C89416 /* TransitionInteractionController.swift */,
-				9B50750B1C68D95600C89416 /* InteractivitySecondViewController.swift */,
 			);
 			name = Interactivity;
 			path = "CustomTransition-Swift/Interactivity";

CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Interactivity/InteractivityFirstViewController.swift

@@ -11,6 +11,8 @@ import UIKit
 class InteractivityFirstViewController: UIViewController {
     lazy var interactivitySecondViewController: InteractivitySecondViewController = InteractivitySecondViewController()
     lazy var customTransitionDelegate: InteractivityTransitionDelegate = InteractivityTransitionDelegate()
+    lazy var interactiveTransitionRecognizer: UIScreenEdgePanGestureRecognizer = UIScreenEdgePanGestureRecognizer.init(target: self, action: Selector("interactiveTransitionRecognizerAction:"))
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = [224, 222, 255].color    // 设置背景颜色
@@ -32,19 +34,12 @@ class InteractivityFirstViewController: UIViewController {
         button.frame.origin.y = view.frame.maxY - 100
         button.setTitleColor(UIColor.blueColor(), forState: .Normal)
         button.setTitle("演示动画", forState: .Normal)
-        button.addTarget(self, action: Selector("animationButtonDidClicked"), forControlEvents: .TouchUpInside)
+        button.addTarget(self, action: Selector("animationButtonDidClicked:"), forControlEvents: .TouchUpInside)
         view.addSubview(button)
 
         /// 添加滑动交互手势
-        let interactiveTransitionRecognizer = UIScreenEdgePanGestureRecognizer.init(target: self, action: Selector("interactiveTransitionRecognizerAction:"))
         interactiveTransitionRecognizer.edges = .Right;
         self.view.addGestureRecognizer(interactiveTransitionRecognizer)
-        
-        /// 设置动画代理
-        customTransitionDelegate.gestureRecognizer = interactiveTransitionRecognizer
-        interactivitySecondViewController.transitioningDelegate = customTransitionDelegate
-        interactivitySecondViewController.modalPresentationStyle = .FullScreen
-        
     }
 
     override func didReceiveMemoryWarning() {
@@ -56,14 +51,25 @@ class InteractivityFirstViewController: UIViewController {
 extension InteractivityFirstViewController {
     func interactiveTransitionRecognizerAction(sender: UIScreenEdgePanGestureRecognizer) {
         if sender.state == .Began {
-            
+            customTransitionDelegate.gestureRecognizer = interactiveTransitionRecognizer
+            self.animationButtonDidClicked(sender)
         }
     }
 }
 
 extension InteractivityFirstViewController {
-    func animationButtonDidClicked() {
+    func animationButtonDidClicked(sender: AnyObject) {
+        /// 设置动画代理
+        if sender.isKindOfClass(UIGestureRecognizer) {
+            customTransitionDelegate.gestureRecognizer = interactiveTransitionRecognizer
+        }
+        else {
+            customTransitionDelegate.gestureRecognizer = nil
+        }
         customTransitionDelegate.targetEdge = .Right
+        interactivitySecondViewController.transitioningDelegate = customTransitionDelegate
+        interactivitySecondViewController.modalPresentationStyle = .FullScreen
+        
         self.presentViewController(interactivitySecondViewController, animated: true, completion: nil)
     }
 

CustomTransition/CustomTransition-Swift/CustomTransition-Swift/Interactivity/InteractivitySecondViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 
 class InteractivitySecondViewController: UIViewController {
+    lazy var interactiveTransitionRecognizer: UIScreenEdgePanGestureRecognizer = UIScreenEdgePanGestureRecognizer.init(target: self, action: Selector("interactiveTransitionRecognizerAction:"))
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -28,33 +29,40 @@ class InteractivitySecondViewController: UIViewController {
         button.frame.origin.y = view.frame.maxY - 100
         button.setTitleColor(UIColor.blueColor(), forState: .Normal)
         button.setTitle("Dismiss", forState: .Normal)
-        button.addTarget(self, action: Selector("buttonDidClicked"), forControlEvents: .TouchUpInside)
+        button.addTarget(self, action: Selector("animationButtonDidClicked:"), forControlEvents: .TouchUpInside)
         view.addSubview(button)
 
         /// 添加滑动交互手势
-        let interactiveTransitionRecognizer = UIScreenEdgePanGestureRecognizer.init(target: self, action: Selector("interactiveTransitionRecognizerAction:"))
-        interactiveTransitionRecognizer.edges = .Right;
+        interactiveTransitionRecognizer.edges = .Left
         self.view.addGestureRecognizer(interactiveTransitionRecognizer)
-        
-        /// 设置动画代理
-        if let transitionDelegate = self.transitioningDelegate as? InteractivityTransitionDelegate {
-            transitionDelegate.gestureRecognizer = interactiveTransitionRecognizer
-        }
     }
 
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
+}
 
+extension InteractivitySecondViewController {
+    func interactiveTransitionRecognizerAction(sender: UIScreenEdgePanGestureRecognizer) {
+        if sender.state == .Began {
+            self.animationButtonDidClicked(sender)
+        }
+    }
 }
 
 extension InteractivitySecondViewController {
-    func buttonDidClicked() {
+    func animationButtonDidClicked(sender: AnyObject) {
         /**
         *  应该由FirstVC执行下面这行代码，为了保持demo简单，突出重点，这里的写法其实是不严格的，请见谅
         */
         if let transitionDelegate = self.transitioningDelegate as? InteractivityTransitionDelegate {
+            if sender.isKindOfClass(UIGestureRecognizer) {
+                transitionDelegate.gestureRecognizer = interactiveTransitionRecognizer
+            }
+            else {
+                transitionDelegate.gestureRecognizer = nil
+            }
             transitionDelegate.targetEdge = .Left
         }
         self.dismissViewControllerAnimated(true, completion: nil)