@aigens/aigens-sdk-core 0.0.38 → 0.0.40

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

@@ -42,6 +42,8 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -80,6 +82,7 @@ public class WebContainerActivity extends BridgeActivity {
         add("payme://");
         add("https://play.google.com");
         add("hsbcpaymepay://");
+        add("mpay://");
     }};
 
     private void debug(Object... msgs) {
@@ -93,9 +96,9 @@ public class WebContainerActivity extends BridgeActivity {
         }
     }
 
-    private String getRedirectUrl() {
+    private String getRedirectUrl(Intent intent) {
         try {
-            Intent intent = getIntent();
+//            Intent intent = getIntent();
             Uri uri = intent.getData();
             if (uri != null) {
                 String totalUrl = uri.toString();
@@ -104,12 +107,25 @@ public class WebContainerActivity extends BridgeActivity {
                 if (perviousIntent != null) {
                     Map member = (Map) perviousIntent.getSerializableExtra("member");
                     universalLink = (String) member.get("universalLink");
-                    universalLink = universalLink.trim();
+                    if (universalLink != null && !universalLink.isEmpty()) {
+                        universalLink = universalLink.trim();
+                    }else {
+                        universalLink = null;
+                    }
                 }
-                if (universalLink != null && totalUrl.startsWith(universalLink) && totalUrl.indexOf("redirect=") >= 0) {
+                if (universalLink != null && (totalUrl.startsWith(universalLink) || universalLink.contains("aigens=true")) && totalUrl.indexOf("redirect=") >= 0) {
                     redirectUrl = totalUrl.split("redirect=")[1];
                 }
+                if (universalLink != null && (totalUrl.startsWith(universalLink) || universalLink.contains("aigens=true")) && totalUrl.indexOf("aigensRedirect/") >= 0) {
+                    redirectUrl = totalUrl.split("aigensRedirect/")[1];
+                }
                 Log.i("getRedirectUrl", totalUrl);
+                if (redirectUrl != null) {
+                    redirectUrl = this.decodeURIComponent(redirectUrl);
+                }
+                if (!redirectUrl.startsWith("http://") && !redirectUrl.startsWith("https://")) {
+                    redirectUrl = "https://" + redirectUrl;
+                }
                 return redirectUrl;
             } else {
                 Log.i("getRedirectUrl", "null");
@@ -122,6 +138,22 @@ public class WebContainerActivity extends BridgeActivity {
 
     }
 
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        // System.out.println("OPEN URL: onNewIntent" + intent.toString());
+        String redirectUrl = getRedirectUrl(intent);
+        if (redirectUrl != null) {
+            if (this.bridge != null && this.bridge.getWebView() != null) {
+                initLayout(false, true, false);
+                this.bridge.getWebView().loadUrl(redirectUrl);
+            }
+        }
+
+
+    }
+
     private void addChannel() {
         if (getIntent() == null) return;
         String url = getIntent().getStringExtra("url");
@@ -144,9 +176,9 @@ public class WebContainerActivity extends BridgeActivity {
 
         setContentView(com.aigens.sdk.R.layout.sdk_layout_main);
 
-        String redirectUrl = getRedirectUrl();
         Intent intent = getIntent();
 
+        String redirectUrl = getRedirectUrl(intent);
         if (redirectUrl != null && !redirectUrl.equals("") && WebContainerActivity.perviousIntent != null) {
             WebContainerActivity.perviousIntent.putExtra("url", redirectUrl);
             intent = WebContainerActivity.perviousIntent;
@@ -266,7 +298,7 @@ public class WebContainerActivity extends BridgeActivity {
         this.bridge.getWebView().setWebViewClient(wvc);
         if (DEBUG) {
             this.bridge.getWebView().setWebContentsDebuggingEnabled(true);
-        }else {
+        } else {
             this.bridge.getWebView().setWebContentsDebuggingEnabled(false);
         }
 
@@ -427,6 +459,15 @@ public class WebContainerActivity extends BridgeActivity {
         return plugins;
     }
 
+    private String decodeURIComponent(String encodedStr) {
+        String decodedStr = encodedStr;
+        try {
+            decodedStr = URLDecoder.decode(encodedStr, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            decodedStr = encodedStr;
+        }
+        return decodedStr;
+    }
     private boolean isDevMode() {
         return (this.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
     }
@@ -732,6 +773,7 @@ public class WebContainerActivity extends BridgeActivity {
         @Override
         public void onPageStarted(WebView view, String url, Bitmap favicon) {
 
+//            Log.wtf(TAG, "onPageStarted: "+url );
             debug("onPageStarted", url);
 
             super.onPageStarted(view, url, favicon);
@@ -752,7 +794,7 @@ public class WebContainerActivity extends BridgeActivity {
         @Override
         public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
             debug("onReceivedErrorOld", errorCode, description, failingUrl);
-            System.out.println("onReceivedErrorOld:"+description+failingUrl);
+            System.out.println("onReceivedErrorOld:" + description + failingUrl);
             if (isFirstError) { // reload
                 isFirstError = false;
                 reload();

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

@@ -135,7 +135,9 @@ public class CorePlugin extends Plugin {
             }
         }
 
-        getActivity().finish();
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
 
     }
 
@@ -159,7 +161,9 @@ public class CorePlugin extends Plugin {
             }
         }
 
-        getActivity().finish();
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
 
 
     }

package/ios/Plugin/CorePlugin.swift

@@ -164,6 +164,8 @@ public class CorePlugin: CAPPlugin {
         let member = call.getObject("member")
         let deeplink = call.getObject("deeplink")
         let externalProtocols = call.getArray("externalProtocols")
+        let addPaddingProtocols = call.getArray("addPaddingProtocols")
+
         let clearCache = call.getBool("clearCache") ?? false
         aigensDebug = call.getBool("debug") ?? false
 
@@ -186,6 +188,9 @@ public class CorePlugin: CAPPlugin {
             if (externalProtocols != nil) {
                 options["externalProtocols"] = externalProtocols as AnyObject
             }
+            if (addPaddingProtocols != nil) {
+                options["addPaddingProtocols"] = addPaddingProtocols as AnyObject
+            }
 
             bridgeVC.options = options;
 
@@ -266,7 +271,7 @@ public class CorePlugin: CAPPlugin {
     @objc func setTextZoom(_ call: CAPPluginCall) {
         call.unimplemented("ios does not implement.")
     }
-    
+
     private func getStringFromQr(_ image: UIImage) -> String? {
         guard let ciImage = CIImage(image: image) else {
             return nil

package/ios/Plugin/WebContainerViewController.swift

@@ -18,8 +18,27 @@ import Capacitor
     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://", "weixin://", "hsbcpaymepay://"
+        "octopus://", "alipay://", "alipays://", "alipayhk://", "https://play.google.com", "https://itunes.apple.com", "tel:", "mailto:", "itms-apps://itunes.apple.com", "https://apps.apple.com", "payme://", "weixin://", "hsbcpaymepay://", "mpay://"
     ]
+    var addPaddingProtocols: [String] = [
+        "https://ap-gateway.mastercard.com",
+        "https://mapi-hk.alipay.com/",
+        "https://mclient.alipay.com/",
+        "https://tscenter.alipay.com/",
+        "https://test.paydollar.com/",
+        "https://paydollar.com/",
+        "https://www.paydollar.com/",
+        "https://web-test.online.octopus.com.hk",
+        "https://web.online.octopus.com.hk",
+        "https://web-prd.online.octopus.com.hk",
+        "http://vmp.eftpay.com.cn",
+        "https://wx.tenpay.com",
+        "https://uatopenapi.macaupay.com.mo",
+        "https://uatpay.macaupass.com",
+        "https://prdpay.macaupass.com",
+        "https://pay.macaupass.com",
+    ]
+
     let containerView = WebContainer.webContainer()
     var webContainerView: WebContainer {
             return containerView
@@ -50,6 +69,15 @@ import Capacitor
 
     }
 
+    private func isPaddingUrl(_ url: URL) -> Bool {
+        var result = false
+        addPaddingProtocols.forEach { (url_) in
+            if (url.absoluteString.starts(with: url_)) {
+                result = true
+            }
+        }
+        return result
+    }
     private func addChannel() {
         if let urlString = self.options?["url"] as? String {
 
@@ -109,11 +137,13 @@ import Capacitor
         }
 
         aigensprint("handleUrlOpened url:\(object)")
-        guard let url = object["url"] as? URL else {
+        guard var url = object["url"] as? URL else {
             return
         }
 
-        if universalLink.isEmpty || !url.absoluteString.starts(with: universalLink) {
+        url = decodeURIComponent(url);
+
+        if universalLink.isEmpty || (!url.absoluteString.starts(with: universalLink) && !universalLink.contains("aigens=true")) {
             return;
         }
 
@@ -124,6 +154,10 @@ import Capacitor
             aigensprint("handleUniversalLink has -- redirect:\(redirect)")
             webContainerView.showLoading(true)
             webContainerView.showError(false)
+        }else if newUrl.absoluteString.range(of: "aigensRedirect/") != nil, let redirect = newUrl.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty {
+            aigensprint("handleUniversalLink has -- aigensRedirect:\(redirect)")
+            webContainerView.showLoading(true)
+            webContainerView.showError(false)
         }
 
         webView?.load(rUrl)
@@ -135,11 +169,14 @@ import Capacitor
         }
 
         aigensprint("handleUniversalLink url:\(object)")
-        guard let url = object["url"] as? URL else {
+        guard var url = object["url"] as? URL else {
             return
         }
 
-        if universalLink.isEmpty || !url.absoluteString.starts(with: universalLink) {
+        url = decodeURIComponent(url);
+
+
+        if universalLink.isEmpty || (!url.absoluteString.starts(with: universalLink) && !universalLink.contains("aigens=true")) {
             return;
         }
 
@@ -151,6 +188,10 @@ import Capacitor
             aigensprint("handleUniversalLink has -- redirect:\(redirect)")
             webContainerView.showLoading(true)
             webContainerView.showError(false)
+        }else if newUrl.absoluteString.range(of: "aigensRedirect/") != nil, let redirect = newUrl.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty {
+            aigensprint("handleUniversalLink has -- aigensRedirect:\(redirect)")
+            webContainerView.showLoading(true)
+            webContainerView.showError(false)
         }
 
 
@@ -206,6 +247,20 @@ import Capacitor
             self.externalProtocols.append(contentsOf: externalProtocols)
         }
 
+        if let addPaddingProtocols = options?["addPaddingProtocols"] as? [String] {
+            self.addPaddingProtocols.append(contentsOf: addPaddingProtocols)
+        }
+
+    }
+
+    private func decodeURIComponent(_ url: URL) -> URL {
+        let str = url.absoluteString
+        let urlStr = str.removingPercentEncoding ?? str
+        return URL(string: urlStr) ?? url
+    }
+
+    private func decodeURIComponent(_ str: String) -> String {
+        return str.removingPercentEncoding ?? str
     }
 
     public final func loadWebViewCustom() {
@@ -215,6 +270,13 @@ import Capacitor
 
 
         let urlString = self.options?["url"] as? String;
+//        urlString = "https://payment2.pizzahut.com.hk/v3/Payment/Completed?TransId=N224A2306130302&Code=4F19FC65-E099-4339-ADF4-3986EF539233"
+//        urlString = "https://payment2.pizzahut.com.hk/v3/Payment/UserCancel?TransId=N224A2306130301&Code=44D4B103-4962-432E-A323-086D46F8BB6F"
+//        urlString = "https://payment2.pizzahut.com.hk/v3/Payment/Completed?TransId=A224A2306131102&Code=104A53FB-053E-4FC1-870E-29D7B39AE2C5"
+
+//        urlString = "https%3a%2f%2fpayment2.pizzahut.com.hk%2fv3%2fPayment%2fCompleted%3fTransId%3dA224A2306131102%26Code%3d104A53FB-053E-4FC1-870E-29D7B39AE2C5";
+//
+//        urlString = decodeURIComponent(urlString!)
 
         if(urlString == nil){
             return;
@@ -311,19 +373,40 @@ extension WebContainerViewController: WKNavigationDelegate {
         }
 
         aigensprint("navURL--:\(navURL)")
+        if !universalLink.isEmpty && (navURL.absoluteString.starts(with: universalLink) || universalLink.contains("aigens=true")) {
 
-        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
-                aigensprint("navURL-- redirect:\(redirect)")
-                webContainerView.showLoading(true)
-                webContainerView.showError(false)
-                let rUrl = URLRequest(url: redirectUrl)
-                webView.load(rUrl)
+            if navURL.absoluteString.range(of: "redirect=") != nil, var redirect = navURL.absoluteString.components(separatedBy:"redirect=").last{
+                if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
+                    redirect = "https://" + redirect
+                }
+                if let redirectUrl = URL(string: redirect) {
+                    self.redirectLink = redirect
+                    aigensprint("navURL-- redirect:\(redirect)")
+                    webContainerView.showLoading(true)
+                    webContainerView.showError(false)
+                    let rUrl = URLRequest(url: redirectUrl)
+                    webView.load(rUrl)
+                    decisionHandler(.cancel)
+                    return;
+                }
             }
-            decisionHandler(.cancel)
-            return;
+            
+            if navURL.absoluteString.range(of: "aigensRedirect/") != nil, var redirect = navURL.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty{
+                if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
+                    redirect = "https://" + redirect
+                }
+                if let redirectUrl = URL(string: redirect) {
+                    self.redirectLink = redirect
+                    aigensprint("navURL-- aigensRedirect:\(redirect)")
+                    webContainerView.showLoading(true)
+                    webContainerView.showError(false)
+                    let rUrl = URLRequest(url: redirectUrl)
+                    webView.load(rUrl)
+                    decisionHandler(.cancel)
+                    return;
+                }
+            }
+
         }
 
         var isCanOpen = false
@@ -394,9 +477,27 @@ extension WebContainerViewController: WKNavigationDelegate {
 //            webView.isOpaque = isOpaque
 //            webViewLoadingState = .subsequentLoad
 //        }
+
+        if let navURL = webView.url, isPaddingUrl(navURL) {
+            webView.evaluateJavaScript("""
+            let bg = document.getElementsByTagName('body');
+            if (bg && bg[0]) {
+                bg[0].style.paddingTop = "\(UIDevice.xp_statusBarHeight())px";
+            }
+
+            let app = document.querySelector('body>#app');
+            if (app && window) {
+               if (window.getComputedStyle(app).position == 'absolute') {
+                    app.style.top = "\(UIDevice.xp_statusBarHeight())px";
+                }
+            }
+
+            """)
+        }
+
         webContainerView.showLoading(false)
         webContainerView.showError(false)
-        CAPLog.print("⚡️  WebView loaded")
+        CAPLog.print("⚡️  WebView loaded:\(webView.url)")
     }
 
     // The force unwrap is part of the protocol declaration, so we should keep it.
@@ -464,3 +565,70 @@ extension UIColor {
             alpha: alpha);
     }
 }
+
+
+extension UIDevice {
+
+    /// 顶部安全区高度
+    static func xp_safeDistanceTop() -> CGFloat {
+        if #available(iOS 13.0, *) {
+            let scene = UIApplication.shared.connectedScenes.first
+            guard let windowScene = scene as? UIWindowScene else { return 0 }
+            guard let window = windowScene.windows.first else { return 0 }
+            return window.safeAreaInsets.top
+        } else if #available(iOS 11.0, *) {
+            guard let window = UIApplication.shared.windows.first else { return 0 }
+            return window.safeAreaInsets.top
+        }
+        return 0;
+    }
+
+    /// 底部安全区高度
+    static func xp_safeDistanceBottom() -> CGFloat {
+        if #available(iOS 13.0, *) {
+            let scene = UIApplication.shared.connectedScenes.first
+            guard let windowScene = scene as? UIWindowScene else { return 0 }
+            guard let window = windowScene.windows.first else { return 0 }
+            return window.safeAreaInsets.bottom
+        } else if #available(iOS 11.0, *) {
+            guard let window = UIApplication.shared.windows.first else { return 0 }
+            return window.safeAreaInsets.bottom
+        }
+        return 0;
+    }
+
+    /// 顶部状态栏高度（包括安全区）
+    static func xp_statusBarHeight() -> CGFloat {
+        var statusBarHeight: CGFloat = 0
+        if #available(iOS 13.0, *) {
+            let scene = UIApplication.shared.connectedScenes.first
+            guard let windowScene = scene as? UIWindowScene else { return 0 }
+            guard let statusBarManager = windowScene.statusBarManager else { return 0 }
+            statusBarHeight = statusBarManager.statusBarFrame.height
+        } else {
+            statusBarHeight = UIApplication.shared.statusBarFrame.height
+        }
+        CAPLog.print("navURL-- height:\(statusBarHeight)")
+        return statusBarHeight
+    }
+
+    /// 导航栏高度
+    static func xp_navigationBarHeight() -> CGFloat {
+        return 44.0
+    }
+
+    /// 状态栏+导航栏的高度
+    static func xp_navigationFullHeight() -> CGFloat {
+        return UIDevice.xp_statusBarHeight() + UIDevice.xp_navigationBarHeight()
+    }
+
+    /// 底部导航栏高度
+    static func xp_tabBarHeight() -> CGFloat {
+        return 49.0
+    }
+
+    /// 底部导航栏高度（包括安全区）
+    static func xp_tabBarFullHeight() -> CGFloat {
+        return UIDevice.xp_tabBarHeight() + UIDevice.xp_safeDistanceBottom()
+    }
+}

package/package.json

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