@aigens/aigens-sdk-core 0.0.10 → 0.0.13

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

@@ -48,15 +48,25 @@ public class WebContainerActivity extends BridgeActivity {
     private Map member;
     private Map deeplink;
     private boolean ENVIRONMENT_PRODUCTION = true;
+    private String[] shouldRedirectList = new String[] {
+            "/scan?",
+            "/qr?",
+            "//scan",
+            "/api/v1/pay",
+            "/api/v1/wechat",
+            "/api/v1/qfpaywechat"
+    };
     private List<String> externalProtocols = new ArrayList<String>(){{
         add("octopus://");
         add("alipay://");
         add("alipays://");
         add("alipayhk://");
+        add("weixin://");
         add("tel:");
         add("mailto:");
         add("payme://");
         add("https://play.google.com");
+        add("hsbcpaymepay://");
     }};
 
     private void debug(Object... msgs){
@@ -310,11 +320,12 @@ public class WebContainerActivity extends BridgeActivity {
                 public WebResourceResponse shouldInterceptRequest(WebResourceRequest request) {
 
                     // Fixed: Sometimes the plugin cannot be loaded
-                    String currentUrl = request.getUrl().toString();
-                    if (currentUrl.equals(originUrl)) {
-                        return bridge.getLocalServer().shouldInterceptRequest(request);
-                    }
-                    return null;
+//                    String currentUrl = request.getUrl().toString();
+//                    if (currentUrl.equals(originUrl)) {
+//                        return bridge.getLocalServer().shouldInterceptRequest(request);
+//                    }
+//                    return null;
+                    return bridge.getLocalServer().shouldInterceptRequest(request);
                 }
             });
         }
@@ -453,17 +464,26 @@ public class WebContainerActivity extends BridgeActivity {
             String url = request.getUrl().toString();
             //debug("shouldInterceptRequest", url);
 
+            Log.wtf("shouldInterceptRequestUrl:", url);
+
 
 
             //support redirect from /scan
-            if(url.indexOf("/scan?") > 0 || url.indexOf("/qr?") > 0 || url.indexOf("//scan") > 0){
-                return null;
-            }
+//            for (String r: shouldRedirectList) {
+//                if (url.indexOf(r) > 0) {
+//                    return null;
+//                }
+//            }
+
+            // call super.shouldInterceptRequest(view, request); at: disableServiceWorker method
+            return null;
+
+//            if(url.indexOf("/scan?") > 0 || url.indexOf("/qr?") > 0 || url.indexOf("//scan") > 0){
+//                return null;
+//            }
 
-            return super.shouldInterceptRequest(view, request);
+//            return super.shouldInterceptRequest(view, request);
 
-            //super.shouldInterceptRequest(view, request);
-            //return null;
         }
 
 

package/ios/Plugin/WebContainerViewController.swift

@@ -13,9 +13,11 @@ import Capacitor
 
     // {themeColor: "#xxxxxx"}
     public var options: Dictionary<String, Any>?
-    
+
+    private var redirectLink = ""
+    private var universalLink = ""
     var externalProtocols: [String] = [
-        "octopus://", "alipay://", "alipays://", "alipayhk://", "https://itunes.apple.com", "tel:", "mailto:", "itms-apps://itunes.apple.com", "https://apps.apple.com", "payme://"
+        "octopus://", "alipay://", "alipays://", "alipayhk://", "https://itunes.apple.com", "tel:", "mailto:", "itms-apps://itunes.apple.com", "https://apps.apple.com", "payme://", "weixin://", "hsbcpaymepay://"
     ]
     let containerView = WebContainer.webContainer()
     var webContainerView: WebContainer {
@@ -28,22 +30,22 @@ import Capacitor
         self.becomeFirstResponder()
         loadWebViewCustom()
         initView()
-        
+
     }
-    
+
     private func initView(){
-        
+
         print("VC initView")
-        
+
         //let bundle = Bundle(for: WebContainerViewController.self)
         //let containerView = WebContainerView()
         //let containerView = bundle.loadNibNamed("WebContainerView", owner: self, options: nil)?.first as! UIView
-        
+
         self.view.addSubview(webContainerView)
         webContainerView.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.size.width, height: UIScreen.main.bounds.size.height)
         setupOptions(webContainerView)
         containerView.vc = self
-        
+
 //
 //
 
@@ -61,14 +63,14 @@ import Capacitor
 //        containerView.webArea.addSubview(self.webView!)
 //
 
-        
+
     }
-    
+
     open override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
         webContainerView.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.size.width, height: UIScreen.main.bounds.size.height)
     }
-    
+
     private func setupOptions(_ view: WebContainer) {
         if let theme = self.options?["themeColor"] as? String, let color = UIColor.getHex(hex: theme) {
             self.view.backgroundColor = color
@@ -79,9 +81,9 @@ import Capacitor
         if let externalProtocols = options?["externalProtocols"] as? [String] {
             self.externalProtocols.append(contentsOf: externalProtocols)
         }
-        
+
     }
-    
+
     public final func loadWebViewCustom() {
 
         //let bridge = self.bridge
@@ -95,13 +97,14 @@ import Capacitor
         }
 
         let url = URL(string: urlString!)
-        
+
         let member = self.options?["member"] as? Dictionary<String, Any>
-        
+        self.universalLink = member?["universalLink"] as? String ?? ""
+
         CorePlugin.member = member
         let deeplink = self.options?["deeplink"] as? Dictionary<String, Any>
         CorePlugin.deeplink = deeplink
-        
+
         //bridge.webViewDelegationHandler.willLoadWebview(webView)
         _ = webView?.load(URLRequest(url: url!))
         webView?.navigationDelegate = self
@@ -134,12 +137,12 @@ import Capacitor
 
         return descriptor
     }
-    
+
     deinit {
         print("WebContainerViewController deinit")
     }
 
-    
+
 }
 
 extension WebContainerViewController: WKNavigationDelegate {
@@ -149,12 +152,12 @@ extension WebContainerViewController: WKNavigationDelegate {
         // Reset the bridge on each navigation
 //        self.bridge?.reset()
     }
-    
+
     public func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
         webContainerView.showError(false)
         webContainerView.showLoading(true)
     }
-    
+
     public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         // post a notification for any listeners
         NotificationCenter.default.post(name: .capacitorDecidePolicyForNavigationAction, object: navigationAction)
@@ -164,7 +167,23 @@ extension WebContainerViewController: WKNavigationDelegate {
             decisionHandler(.allow)
             return
         }
-        
+
+        print("navURL--:\(navURL)")
+
+        if !universalLink.isEmpty && navURL.absoluteString.starts(with: universalLink) {
+
+            if navURL.absoluteString.range(of: "redirect=") != nil, let redirect = navURL.absoluteString.components(separatedBy:"redirect=").last, let redirectUrl = URL(string: redirect) {
+                self.redirectLink = redirect
+                print("navURL-- redirect:\(redirect)")
+                webContainerView.showLoading(true)
+                webContainerView.showError(false)
+                let rUrl = URLRequest(url: redirectUrl)
+                webView.load(rUrl)
+            }
+            decisionHandler(.cancel)
+            return;
+        }
+
         var isCanOpen = false
         if externalProtocols.count > 0 {
             externalProtocols.forEach { (url) in
@@ -174,7 +193,7 @@ extension WebContainerViewController: WKNavigationDelegate {
                 }
             }
         }
-        
+
         if isCanOpen {
             if #available(iOS 10.0, *) {
                 UIApplication.shared.open(navURL, options: [:], completionHandler: nil);
@@ -184,7 +203,7 @@ extension WebContainerViewController: WKNavigationDelegate {
             decisionHandler(.cancel)
             return;
         }
-        
+
 
         // first, give plugins the chance to handle the decision
 //        for pluginObject in bridge.plugins {
@@ -224,8 +243,8 @@ extension WebContainerViewController: WKNavigationDelegate {
         // fallthrough to allowing it
         decisionHandler(.allow)
     }
-    
-    
+
+
     // 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, didFinish navigation: WKNavigation!) {
@@ -237,7 +256,7 @@ extension WebContainerViewController: WKNavigationDelegate {
         webContainerView.showError(false)
         CAPLog.print("⚡️  WebView loaded")
     }
-    
+
     // 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, didFail navigation: WKNavigation!, withError error: Error) {
@@ -246,12 +265,12 @@ extension WebContainerViewController: WKNavigationDelegate {
 //            webViewLoadingState = .subsequentLoad
 //        }
         webContainerView.showLoading(false)
-        
+
         webContainerView.showError(true, error.localizedDescription)
         CAPLog.print("⚡️  WebView failed to load")
         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) {
@@ -263,9 +282,22 @@ extension WebContainerViewController: WKNavigationDelegate {
         }
         CAPLog.print("⚡️  WebView failed provisional navigation")
         CAPLog.print("⚡️  Error: " + error.localizedDescription)
-        webContainerView.showError(true, error.localizedDescription)
+
+        if let errorUrl = webView.url?.absoluteString {
+            print("navURL-- errorUrl: \(errorUrl)")
+            if (!self.redirectLink.isEmpty && errorUrl.starts(with: self.redirectLink)) {
+                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.10",
+  "version": "0.0.13",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -74,8 +74,5 @@
     "android": {
       "src": "android"
     }
-  },
-  "dependencies": {
-    "aigens-mono": "file:../.."
   }
 }