Merge pull request #29 from JonyFang/develop

JonyFang · web-flow · commit 4c2ea1daf1a2 · 2020-08-30T14:56:28.000+08:00
fix #11
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.2
+osx_image: xcode11.4
 
 xcode_workspace: FFPopup.xcworkspace
 podfile: Demo/Podfile
@@ -24,15 +24,15 @@ script:
   - pod lib lint --allow-warnings
 
   - echo Build as static library
-  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Static" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Static" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
 
   - echo Build as dynamic framework
-  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
 
   - echo Build the Demo apps
   - pod install --project-directory=Demo
-  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Objc" -configuration Debug -destination "name=iPhone XS" | xcpretty -c
-  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Swift" -configuration Debug -destination "name=iPhone XS" | xcpretty -c
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Objc" -destination 'platform=iOS Simulator,name=iPhone 11 Pro' -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
+  - xcodebuild build -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "FFPopup_Swift" -destination 'platform=iOS Simulator,name=iPhone 11 Pro' -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
 
   - echo Clean DerivedData
   - rm -rf ~/Library/Developer/Xcode/DerivedData/
diff --git a/Demo/FFPopup_Demo.xcodeproj/project.pbxproj b/Demo/FFPopup_Demo.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -355,7 +355,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1020;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1160;
 				ORGANIZATIONNAME = JonyFang;
 				TargetAttributes = {
 					D3160D0A2275AEA3000180F0 = {
@@ -691,6 +691,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
diff --git a/Demo/FFPopup_Demo.xcodeproj/xcshareddata/xcschemes/FFPopup_Objc.xcscheme b/Demo/FFPopup_Demo.xcodeproj/xcshareddata/xcschemes/FFPopup_Objc.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Demo/FFPopup_Demo.xcodeproj/xcshareddata/xcschemes/FFPopup_Swift.xcscheme b/Demo/FFPopup_Demo.xcodeproj/xcshareddata/xcschemes/FFPopup_Swift.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:FFPopup_Demo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/FFPopup.podspec b/FFPopup.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name                = "FFPopup"
-  s.version             = "1.1.3"
+  s.version             = "1.1.4"
   s.summary             = "Presenting custom views as a popup in iOS."
 
   s.description         = <<-DESC
diff --git a/FFPopup.xcodeproj/xcshareddata/xcschemes/FFPopup.xcscheme b/FFPopup.xcodeproj/xcshareddata/xcschemes/FFPopup.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:FFPopup.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/FFPopup.xcodeproj/xcshareddata/xcschemes/FFPopup_Static.xcscheme b/FFPopup.xcodeproj/xcshareddata/xcschemes/FFPopup_Static.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:FFPopup.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/FFPopup.xcodeproj/xcuserdata/jonyfang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FFPopup.xcodeproj/xcuserdata/jonyfang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Bucket
+   uuid = "C8002E65-2166-44F3-824D-C51CBE07153F"
    type = "1"
    version = "2.0">
    <Breakpoints>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "E10A1F32-1FFA-4150-9607-F7F2899FDB42"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -22,6 +24,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "1B0E021B-56E9-4DC9-9E8A-58B41DFC597A"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -38,6 +41,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "F44F5AAF-E351-4CC4-BBCD-F0CEC142E18C"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -54,6 +58,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "71099A3B-194C-421D-BBD9-8B3CEF09CE8B"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -70,6 +75,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "05EA5E7B-2BF1-41C4-B0DB-A28DA5091D71"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -86,6 +92,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "41D43C3B-F418-48BE-9A45-C0EA0E4C58DB"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -102,6 +109,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "2D6A5D85-C758-489E-8E4A-E5312307F592"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -118,6 +126,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "16B2D79A-D7CE-44EF-BBE0-08BD95F79CA2"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -127,13 +136,14 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "211"
             endingLineNumber = "211"
-            landmarkName = "@interface FFPopup"
-            landmarkType = "2">
+            landmarkName = "+popupWithContentView:showType:dismissType:maskType:dismissOnBackgroundTouch:dismissOnContentTouch:"
+            landmarkType = "6">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
+            uuid = "2B87C562-D237-4575-A65A-F4BF89468446"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -143,8 +153,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "232"
             endingLineNumber = "232"
-            landmarkName = "@interface FFPopup"
-            landmarkType = "2">
+            landmarkName = "+dismissSuperPopupIn:animated:"
+            landmarkType = "6">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>
diff --git a/FFPopup/Classes/FFPopup.m b/FFPopup/Classes/FFPopup.m
@@ -210,7 +210,7 @@ - (void)showWithParameters:(NSDictionary *)parameters {
             if (!strongSelf.superview) {
                 NSEnumerator *reverseWindows = [[[UIApplication sharedApplication] windows] reverseObjectEnumerator];
                 for (UIWindow *window in reverseWindows) {
-                    if (window.windowLevel == UIWindowLevelNormal) {
+                    if (window.windowLevel == UIWindowLevelNormal && !window.hidden) {
                         [window addSubview:self];
                         break;
                     }
diff --git a/Gemfile b/Gemfile
@@ -4,4 +4,4 @@ source "https://gems.ruby-china.com"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-gem "cocoapods", "1.7.1"
+gem "cocoapods", "1.9.3"
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Shell/deploy-podspec.sh b/Shell/deploy-podspec.sh

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ - (void)showWithParameters:(NSDictionary *)parameters {`
`210`	`210`	`if (!strongSelf.superview) {`
`211`	`211`	`NSEnumerator *reverseWindows = [[[UIApplication sharedApplication] windows] reverseObjectEnumerator];`
`212`	`212`	`for (UIWindow *window in reverseWindows) {`
`213`		`- if (window.windowLevel == UIWindowLevelNormal) {`
	`213`	`+ if (window.windowLevel == UIWindowLevelNormal && !window.hidden) {`
`214`	`214`	`[window addSubview:self];`
`215`	`215`	`break;`
`216`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ source "https://gems.ruby-china.com"`
`4`	`4`
`5`	`5`	`git_source(:github) {\|repo_name\| "https://github.com/#{repo_name}" }`
`6`	`6`
`7`		`-gem "cocoapods", "1.7.1"`
	`7`	`+gem "cocoapods", "1.9.3"`