手势调整

ChavezChen · Feb 7, 2018 · 2cc6eb1 · 2cc6eb1
1 parent e23108c
commit 2cc6eb1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/CWLateralSlide.podspec b/CWLateralSlide.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "CWLateralSlide"
-  s.version      = "1.5.6"
+  s.version      = "1.5.7"
   s.summary      = "侧滑框架."
 
   s.description  = "一行代码集成侧滑功能."
@@ -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.6" }
+  s.source       = { :git => "https://github.com/ChavezChen/CWLateralSlide.git", :tag => "1.5.7" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

diff --git a/CWLateralSlide/CWInteractiveTransition.m b/CWLateralSlide/CWInteractiveTransition.m
@@ -184,12 +184,13 @@ - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+#pragma mark - UIGestureRecognizerDelegate
 -(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
 
-    if ([otherGestureRecognizer.view isKindOfClass:[UIScrollView class]]) {
-        return NO;
+    if ([otherGestureRecognizer.view isKindOfClass:[UITableView class]]) {
+        return YES;
     }
-    return YES;
+    return NO;
 }
 
 

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

diff --git a/...o.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate b/...o.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
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.6</string>
+	<string>1.5.7</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>