Merge branch 'xiezhaolin' into develop

galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift

@@ -28,7 +28,7 @@ class YHBaseViewController: UIViewController {
 #if DEBUG
         IQKeyboardManager.shared.enable = true
 #endif
-        navigationController?.interactivePopGestureRecognizer?.delegate = self
+//        navigationController?.interactivePopGestureRecognizer?.delegate = self
     }
     
     override var prefersStatusBarHidden: Bool {
@@ -75,10 +75,10 @@ class YHBaseViewController: UIViewController {
     }
 }
 
-extension YHBaseViewController: UIGestureRecognizerDelegate {
-    // 这个方法是在手势将要激活前调用
-    // 返回YES允许右滑手势的激活，返回NO不允许右滑手势的激活
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        return true
-    }
-}
+//extension YHBaseViewController: UIGestureRecognizerDelegate {
+////     这个方法是在手势将要激活前调用
+////     返回YES允许右滑手势的激活，返回NO不允许右滑手势的激活
+//    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+//        return true
+//    }
+//}

galaxy/galaxy/Classes/Base/C/YHNavigationController.swift

@@ -10,7 +10,7 @@ import UIKit
 class YHNavigationController: UINavigationController {
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.interactivePopGestureRecognizer?.delegate = self
+//        self.interactivePopGestureRecognizer?.delegate = self
     }
 
     override func pushViewController(_ viewController: UIViewController, animated: Bool) {
@@ -22,22 +22,22 @@ class YHNavigationController: UINavigationController {
     }
 }
 
-extension YHNavigationController: UIGestureRecognizerDelegate {
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        if self.viewControllers.count <= 1 {
-            return false
-        }
-        return true
-    }
-    
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
-        if touch.view == gestureRecognizer.view {
-            return true
-        }
-        return false
-    }
-    
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        return false
-    }
-}
+//extension YHNavigationController: UIGestureRecognizerDelegate {
+//    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+//        if self.viewControllers.count <= 1 {
+//            return false
+//        }
+//        return true
+//    }
+//    
+//    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+//        if touch.view == gestureRecognizer.view {
+//            return true
+//        }
+//        return false
+//    }
+//    
+//    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+//        return false
+//    }
+//}