修复停留在网页浏览页面时点击推送无响应的问题。

Bark/AppDelegate.swift

@@ -53,65 +53,75 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         
         let navigationController = ((self.window?.rootViewController as? BarkSnackbarController)?
             .rootViewController as? BarkNavigationController)
-        let alert = (userInfo["aps"] as? [String:Any])?["alert"] as? [String:Any]
-        let title = alert?["title"] as? String
-        let body = alert?["body"] as? String
-        let url:URL? = {
-            if let url = userInfo["url"] as? String {
-                return URL(string: url)
+        func presentController(){
+            let alert = (userInfo["aps"] as? [String:Any])?["alert"] as? [String:Any]
+            let title = alert?["title"] as? String
+            let body = alert?["body"] as? String
+            let url:URL? = {
+                if let url = userInfo["url"] as? String {
+                    return URL(string: url)
+                }
+                return nil
+            }()
+            
+            //URL 直接打开
+            if let url = url {
+                if ["http","https"].contains(url.scheme?.lowercased() ?? ""){
+                    navigationController?.present(BarkSFSafariViewController(url: url), animated: true, completion: nil)
+                }
+                else{
+                    UIApplication.shared.open(url, options: [:], completionHandler: nil)
+                }
+                return
             }
-            return nil
-        }()
-        
-        //URL 直接打开
-        if let url = url {
-            if ["http","https"].contains(url.scheme?.lowercased() ?? ""){
-                navigationController?.present(BarkSFSafariViewController(url: url), animated: true, completion: nil)
-            }
-            else{
-                UIApplication.shared.open(url, options: [:], completionHandler: nil)
-            }
-            return
+            
+            
+            let alertController = UIAlertController(title: title, message: body, preferredStyle: .alert)
+            alertController.addAction(UIAlertAction(title: "复制内容", style: .default, handler: { (_) in
+                if let copy = userInfo["copy"] as? String {
+                    UIPasteboard.general.string = copy
+                }
+                else{
+                    UIPasteboard.general.string = body
+                }
+            }))
+            alertController.addAction(UIAlertAction(title: "更多操作", style: .default, handler: { (_) in
+                var shareContent = ""
+                if let title = title {
+                    shareContent += "\(title)\n"
+                }
+                if let body = body {
+                    shareContent += "\(body)\n"
+                }
+                for (key,value) in userInfo {
+                    if ["aps","title","body","url"].contains((key as? String) ?? "") {
+                        continue
+                    }
+                    shareContent += "\(key): \(value) \n"
+                }
+                var items:[Any] = []
+                items.append(shareContent)
+                if let url = url{
+                    items.append(url)
+                }
+                let controller = UIApplication.shared.keyWindow?.rootViewController
+                let activityController = UIActivityViewController(activityItems: items,
+                                                                  applicationActivities: nil)
+                controller?.present(activityController, animated: true, completion: nil)
+            }))
+            alertController.addAction(UIAlertAction(title: "取消", style: .cancel, handler: nil))
+            
+            navigationController?.present(alertController, animated: true, completion: nil)
         }
         
-        
-        let alertController = UIAlertController(title: title, message: body, preferredStyle: .alert)
-        alertController.addAction(UIAlertAction(title: "复制内容", style: .default, handler: { (_) in
-            if let copy = userInfo["copy"] as? String {
-                UIPasteboard.general.string = copy
+        if let presentedController = navigationController?.presentedViewController {
+            presentedController.dismiss(animated: false) {
+                presentController()
             }
-            else{
-                UIPasteboard.general.string = body
-            }
-        }))
-        alertController.addAction(UIAlertAction(title: "更多操作", style: .default, handler: { (_) in
-            var shareContent = ""
-            if let title = title {
-                shareContent += "\(title)\n"
-            }
-            if let body = body {
-                shareContent += "\(body)\n"
-            }
-            for (key,value) in userInfo {
-                if ["aps","title","body","url"].contains((key as? String) ?? "") {
-                    continue
-                }
-                shareContent += "\(key): \(value) \n"
-            }
-            var items:[Any] = []
-            items.append(shareContent)
-            if let url = url{
-                items.append(url)
-            }
-            let controller = UIApplication.shared.keyWindow?.rootViewController
-            let activityController = UIActivityViewController(activityItems: items,
-                                                              applicationActivities: nil)
-            controller?.present(activityController, animated: true, completion: nil)
-        }))
-        alertController.addAction(UIAlertAction(title: "取消", style: .cancel, handler: nil))
-        
-        navigationController?.present(alertController, animated: true, completion: nil)
-        
+        }
+        else{
+            presentController()
+        }
     
     }
     

Bark/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

NotificationServiceExtension/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

notificationContentExtension/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>