@aigens/aigens-sdk-core 0.0.20 → 0.0.22

package/android/src/main/java/com/aigens/sdk/WebContainerActivity.java

@@ -215,6 +215,7 @@ public class WebContainerActivity extends BridgeActivity {
                 "com.aigens.googlepay.GooglePayPlugin",
                 "com.aigens.octopus.OctopusPlugin",
                 "com.aigens.wechatpay.WechatPayPlugin",
+                "com.aigens.sdk.wechathk.WechatHKPlugin",
                 "com.aigens.alipay.AliPayPlugin",
                 "com.aigens.alipayhk.AliPayhkPlugin",
                 "com.aigens.payme.PaymePlugin",
@@ -233,6 +234,8 @@ public class WebContainerActivity extends BridgeActivity {
         this.bridge.getWebView().setWebViewClient(wvc);
         this.bridge.getWebView().setWebContentsDebuggingEnabled(true);
 
+        this.bridge.getWebView().getSettings().setUseWideViewPort(true);
+        this.bridge.getWebView().getSettings().setLoadWithOverviewMode(true);
 
 //          this.bridge.getWebView().getSettings().setAppCacheEnabled(false);
 //          this.bridge.getWebView().clearCache(true);

package/android/src/main/java/com/aigens/sdk/plugins/CorePlugin.java

@@ -149,7 +149,7 @@ public class CorePlugin extends Plugin {
 
             }
         }
-        if (deeplinkMap != null) {
+        if (deeplink != null) {
             Iterator<String> iter = deeplink.keys();
             while (iter.hasNext()) {
                 String k = iter.next();

package/ios/Plugin/CorePlugin.swift

@@ -9,10 +9,32 @@ import UIKit
 @objc(CorePlugin)
 public class CorePlugin: CAPPlugin {
 
+    public static let shared = CorePlugin()
     private let implementation = Core()
     public static var member: Dictionary<String, Any>?
     public static var deeplink: Dictionary<String, Any>?
 
+    @objc public func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+        NotificationCenter.default.post(name: .capacitorOpenURL, object: [
+            "url": url,
+            "options": options
+        ])
+        NotificationCenter.default.post(name: NSNotification.Name.CDVPluginHandleOpenURL, object: url)
+        return true
+    }
+
+    @objc public func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        // TODO: Support other types, emit to rest of plugins
+        if userActivity.activityType != NSUserActivityTypeBrowsingWeb || userActivity.webpageURL == nil {
+            return false
+        }
+        let url = userActivity.webpageURL
+        NotificationCenter.default.post(name: .capacitorOpenUniversalLink, object: [
+            "url": url
+        ])
+        return true
+    }
+
     @objc func echo(_ call: CAPPluginCall) {
 
         print("CorePlugin echo")

package/ios/Plugin/WebContainerViewController.swift

@@ -275,15 +275,15 @@ extension WebContainerViewController: WKNavigationDelegate {
         }
 
         // otherwise, is this a new window or a main frame navigation but to an outside source
-        let toplevelNavigation = (navigationAction.targetFrame == nil || navigationAction.targetFrame?.isMainFrame == true)
-        if navURL.absoluteString.contains(bridge.config.serverURL.absoluteString) == false, toplevelNavigation {
-            // disallow and let the system handle it
-            if UIApplication.shared.applicationState == .active {
-                UIApplication.shared.open(navURL, options: [:], completionHandler: nil)
-            }
-            decisionHandler(.cancel)
-            return
-        }
+//        let toplevelNavigation = (navigationAction.targetFrame == nil || navigationAction.targetFrame?.isMainFrame == true)
+//        if navURL.absoluteString.contains(bridge.config.serverURL.absoluteString) == false, toplevelNavigation {
+//            // disallow and let the system handle it
+//            if UIApplication.shared.applicationState == .active {
+//                UIApplication.shared.open(navURL, options: [:], completionHandler: nil)
+//            }
+//            decisionHandler(.cancel)
+//            return
+//        }
 
         // fallthrough to allowing it
         decisionHandler(.allow)
@@ -316,31 +316,31 @@ extension WebContainerViewController: WKNavigationDelegate {
         CAPLog.print("⚡️  Error: " + error.localizedDescription)
     }
 
-    // The force unwrap is part of the protocol declaration, so we should keep it.
-    // swiftlint:disable:next implicitly_unwrapped_optional
-    public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        webContainerView.showLoading(false)
-        // cancel
-        let e = error as NSError
-        if (e.code == NSURLErrorCancelled || e.code == -999) {
-            webContainerView.showError(false)
-        }
-        CAPLog.print("⚡️  WebView failed provisional navigation")
-        CAPLog.print("⚡️  Error: " + error.localizedDescription)
-
-        if let errorUrl = webView.url?.absoluteString {
-            print("navURL-- errorUrl: \(errorUrl)")
-            if (!self.redirectLink.isEmpty && errorUrl.starts(with: self.redirectLink)) {
-                webContainerView.showError(false)
-                webContainerView.showLoading(true)
-            }else {
-                webContainerView.showError(true, error.localizedDescription)
-            }
-        }else {
-            webContainerView.showError(true, error.localizedDescription)
-        }
-
-    }
+//    // The force unwrap is part of the protocol declaration, so we should keep it.
+//    // swiftlint:disable:next implicitly_unwrapped_optional
+//    public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+//        webContainerView.showLoading(false)
+//        // cancel
+//        let e = error as NSError
+//        if (e.code == NSURLErrorCancelled || e.code == -999) {
+//            webContainerView.showError(false)
+//        }
+//        CAPLog.print("⚡️  WebView failed provisional navigation")
+//        CAPLog.print("⚡️  Error: " + error.localizedDescription)
+//
+//        if let errorUrl = webView.url?.absoluteString {
+//            print("navURL-- errorUrl: \(errorUrl)")
+//            if (!self.redirectLink.isEmpty && errorUrl.starts(with: self.redirectLink)) {
+//                webContainerView.showError(false)
+//                webContainerView.showLoading(true)
+//            }else {
+//                webContainerView.showError(true, error.localizedDescription)
+//            }
+//        }else {
+//            webContainerView.showError(true, error.localizedDescription)
+//        }
+//
+//    }
 
     public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
         webView.reload()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigens/aigens-sdk-core",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",