diff --git a/SJBackGRProject/.DS_Store b/SJBackGRProject/.DS_Store index 1e008ed..11552a1 100644 Binary files a/SJBackGRProject/.DS_Store and b/SJBackGRProject/.DS_Store differ diff --git a/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj b/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj index 08b943f..be8d599 100644 --- a/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj +++ b/SJBackGRProject/SJBackGRProject.xcodeproj/project.pbxproj @@ -434,7 +434,7 @@ TargetAttributes = { 77D9B7621F7E941A00E35746 = { CreatedOnToolsVersion = 8.3.3; - DevelopmentTeam = DB5B5F2RH5; + DevelopmentTeam = U5A7L7SMNP; ProvisioningStyle = Manual; }; A6A0A8FC20410F2B003DB0A0 = { @@ -839,14 +839,14 @@ baseConfigurationReference = 39202E5F7055D8AC447FC6B4 /* Pods-SJBackGRProject.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = DB5B5F2RH5; + DEVELOPMENT_TEAM = U5A7L7SMNP; INFOPLIST_FILE = SJBackGRProject/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.SanJiang.SJBackGRProject; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "acd2453e-e396-4ccf-bf56-508276824c6c"; - PROVISIONING_PROFILE_SPECIFIER = SanJiangDevelopment; + PROVISIONING_PROFILE = "ca8186e4-0d11-4c23-9f2f-50f3a29199fd"; + PROVISIONING_PROFILE_SPECIFIER = WildcardProfile; }; name = Debug; }; diff --git a/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate index 38d907a..3a74e5f 100644 Binary files a/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate and b/SJBackGRProject/SJBackGRProject.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SJFullscreenPopGesture.podspec b/SJFullscreenPopGesture.podspec index bfab3cc..a236205 100644 --- a/SJFullscreenPopGesture.podspec +++ b/SJFullscreenPopGesture.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "SJFullscreenPopGesture" - s.version = "1.3.7.2" + s.version = "1.3.7.3" s.summary = "fullscreen pop gestures." # This description is used to generate tags and improve search results. diff --git a/SJFullscreenPopGesture/UINavigationController+SJVideoPlayerAdd.m b/SJFullscreenPopGesture/UINavigationController+SJVideoPlayerAdd.m index 8797963..c5e993f 100644 --- a/SJFullscreenPopGesture/UINavigationController+SJVideoPlayerAdd.m +++ b/SJFullscreenPopGesture/UINavigationController+SJVideoPlayerAdd.m @@ -283,19 +283,19 @@ - (BOOL)gestureRecognizerShouldBegin:(UIPanGestureRecognizer *)gestureRecognizer - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { if ( UIGestureRecognizerStateFailed == gestureRecognizer.state || - UIGestureRecognizerStateCancelled == gestureRecognizer.state ) return NO; + UIGestureRecognizerStateCancelled == gestureRecognizer.state ) return NO; + else if ( ([otherGestureRecognizer isMemberOfClass:NSClassFromString(@"UIScrollViewPanGestureRecognizer")] || - [otherGestureRecognizer isMemberOfClass:NSClassFromString(@"UIScrollViewPagingSwipeGestureRecognizer")]) - && [otherGestureRecognizer.view isKindOfClass:[UIScrollView class]] ) { + [otherGestureRecognizer isMemberOfClass:NSClassFromString(@"UIScrollViewPagingSwipeGestureRecognizer")]) + && [otherGestureRecognizer.view isKindOfClass:[UIScrollView class]] ) { return [self SJ_considerScrollView:(UIScrollView *)otherGestureRecognizer.view gestureRecognizer:(UIPanGestureRecognizer *)gestureRecognizer otherGestureRecognizer:otherGestureRecognizer]; } - else if ( [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] ) { - return NO; // pop手势不触发 - } - // 除 pan 手势, 其他手势同时触发 + else if ( [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] ) { + return NO; + } return YES; } diff --git a/SJNavigationPopGesture.podspec b/SJNavigationPopGesture.podspec index ad8b50f..418140b 100644 --- a/SJNavigationPopGesture.podspec +++ b/SJNavigationPopGesture.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "SJNavigationPopGesture" - s.version = "1.3.7.2" + s.version = "1.3.7.3" s.summary = "fullscreen pop gestures." # This description is used to generate tags and improve search results. diff --git a/SJNavigationPopGesture/SJNavigationPopGesture.swift b/SJNavigationPopGesture/SJNavigationPopGesture.swift index 6605b73..ddeda47 100644 --- a/SJNavigationPopGesture/SJNavigationPopGesture.swift +++ b/SJNavigationPopGesture/SJNavigationPopGesture.swift @@ -482,16 +482,14 @@ extension UINavigationController : UIGestureRecognizerDelegate { if ( gestureRecognizer.state == UIGestureRecognizerState.failed || gestureRecognizer.state == UIGestureRecognizerState.cancelled ) { return false - } - + } else if ( otherGestureRecognizer.isMember(of: NSClassFromString("UIScrollViewPanGestureRecognizer")!) == true || - otherGestureRecognizer.isMember(of: NSClassFromString("UIScrollViewPagingSwipeGestureRecognizer")!) == true || - otherGestureRecognizer.isMember(of: UIScrollView.self) == true ) { + otherGestureRecognizer.isMember(of: NSClassFromString("UIScrollViewPagingSwipeGestureRecognizer")!) == true + && otherGestureRecognizer.isKind(of: UIScrollView.self) == true ) { let scrollView = otherGestureRecognizer.view as! UIScrollView let panGesture = gestureRecognizer as! UIPanGestureRecognizer return SJ_considerScrollView(scrollView, panGesture, otherGestureRecognizer) } - else if ( otherGestureRecognizer.isKind(of: UIPanGestureRecognizer.self) ) { return false }