@aigens/aigens-sdk-core 0.0.11 → 0.0.14

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

@@ -42,47 +42,94 @@ import java.util.Map;
 
 public class WebContainerActivity extends BridgeActivity {
 
+    static Bundle perviousInstanceState;
+    static Intent perviousIntent;
     private boolean DEBUG = CorePlugin.DEBUG;
     private String url;
     private boolean navbar = false;
     private Map member;
     private Map deeplink;
     private boolean ENVIRONMENT_PRODUCTION = true;
-    private List<String> externalProtocols = new ArrayList<String>(){{
+    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("weixin://");
         add("https://play.google.com");
+        add("hsbcpaymepay://");
     }};
 
-    private void debug(Object... msgs){
+    private void debug(Object... msgs) {
 
 
-        if(DEBUG){
-            for(Object m: msgs){
+        if (DEBUG) {
+            for (Object m : msgs) {
                 System.out.println(m);
             }
 
         }
     }
 
+    private String getRedirectUrl() {
+        Intent intent = getIntent();
+        Uri uri = intent.getData();
+        if (uri != null) {
+            String totalUrl = uri.toString();
+            String redirectUrl = null;
+            String universalLink = null;
+            if (perviousIntent != null) {
+                Map member = (Map) perviousIntent.getSerializableExtra("member");
+                universalLink = (String) member.get("universalLink");
+            }
+            if (universalLink != null && totalUrl.startsWith(universalLink) && totalUrl.indexOf("redirect=") >= 0) {
+                redirectUrl = totalUrl.split("redirect=")[1];
+            }
+            Log.i("getRedirectUrl", totalUrl);
+            return redirectUrl;
+        } else {
+            Log.i("getRedirectUrl", "null");
+            return null;
+        }
 
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        super.onCreate(savedInstanceState);
+        Bundle currentInstanceState = savedInstanceState;
 
-        setContentView(com.aigens.sdk.R.layout.sdk_layout_main);
+        super.onCreate(currentInstanceState);
 
+        setContentView(com.aigens.sdk.R.layout.sdk_layout_main);
 
 
+        String redirectUrl = getRedirectUrl();
         Intent intent = getIntent();
+
+        if (redirectUrl != null && !redirectUrl.equals("") && WebContainerActivity.perviousIntent != null) {
+            perviousIntent.putExtra("url", redirectUrl);
+            intent = perviousIntent;
+            currentInstanceState = WebContainerActivity.perviousInstanceState;
+            WebContainerActivity.perviousIntent = null;
+            WebContainerActivity.perviousInstanceState = null;
+        } else {
+            WebContainerActivity.perviousIntent = intent;
+            WebContainerActivity.perviousInstanceState = currentInstanceState;
+        }
+
+
         this.url = intent.getStringExtra("url");
 
         //if navbar = true, show nav bar with "Done" button
@@ -100,23 +147,23 @@ public class WebContainerActivity extends BridgeActivity {
             }
         }
 
-        if(this.member != null) {
+        if (this.member != null) {
             CorePlugin.setMember(this.member);
         }
         if (this.deeplink != null) {
             CorePlugin.setDeeplink(this.deeplink);
         }
 
-        System.out.println("OPEN URL:"+ url);
+        System.out.println("OPEN URL:" + url);
 
-        if(url == null){
+        if (url == null) {
             System.err.println("CONFIG ERROR MISSING NATIVE URL");
         }
 
-        if(member != null){
+        if (member != null) {
             debug("member", member);
         }
-        if(member != null){
+        if (member != null) {
             debug("deeplink", deeplink);
         }
 
@@ -127,7 +174,7 @@ public class WebContainerActivity extends BridgeActivity {
         JSONObject server = config.optJSONObject("server");
 
         try {
-            if(url != null){
+            if (url != null) {
                 server.putOpt("url", url);
             }
 
@@ -144,19 +191,19 @@ public class WebContainerActivity extends BridgeActivity {
 
         List<Class<? extends Plugin>> auto = loadPlugins();
 
-        for(Class c: auto){
+        for (Class c : auto) {
 
             String clsName = c.getName();
 
-            if(clsName.endsWith("SplashScreenPlugin")){
+            if (clsName.endsWith("SplashScreenPlugin")) {
                 //don't add the splash screen plugin so it doesn't show the splash screen again
-            }else{
+            } else {
                 plugins.add(c);
             }
 
         }
 
-        addExtraPlugins(new String[] {
+        addExtraPlugins(new String[]{
                 "com.aigens.googlepay.GooglePayPlugin",
                 "com.aigens.octopus.OctopusPlugin",
                 "com.aigens.wechatpay.WechatPayPlugin",
@@ -168,7 +215,7 @@ public class WebContainerActivity extends BridgeActivity {
 
         debug("App plugins:" + plugins);
 
-        super.init(savedInstanceState, plugins, cc);
+        super.init(currentInstanceState, plugins, cc);
 
         //still have time to override webview client to avoid any intercept
 
@@ -184,7 +231,7 @@ public class WebContainerActivity extends BridgeActivity {
         // this.bridge.getWebView().clearFormData();
         //  this.bridge.getWebView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
 
-        initView();
+        initView(intent);
         initLayout(false, true, false);
 
         disableServiceWorker(this.url, this.bridge);
@@ -214,7 +261,7 @@ public class WebContainerActivity extends BridgeActivity {
         }
     }
 
-    private void initView(){
+    private void initView(Intent intent) {
 
         Button backButton = (Button) findViewById(R.id.back);
         backButton.setOnClickListener(new View.OnClickListener() {
@@ -236,11 +283,11 @@ public class WebContainerActivity extends BridgeActivity {
             }
         });
 
-        setTheme();
+        setTheme(intent);
 
     }
 
-    private void reload(){
+    private void reload() {
 
         String url = this.url;
 
@@ -254,8 +301,7 @@ public class WebContainerActivity extends BridgeActivity {
 
     }
 
-    private void setTheme() {
-        Intent intent = getIntent();
+    private void setTheme(Intent intent) {
         String themeColor = intent.getStringExtra("themeColor");
         if (!TextUtils.isEmpty(themeColor)) {
             View info = findViewById(R.id.info);
@@ -266,9 +312,10 @@ public class WebContainerActivity extends BridgeActivity {
             getWindow().setStatusBarColor(Color.parseColor(themeColor));//set statussbar color
         }
     }
-    private void initLayout(boolean showWeb, boolean showInfo, boolean showError){
 
-        if(showError){
+    private void initLayout(boolean showWeb, boolean showInfo, boolean showError) {
+
+        if (showError) {
             showWeb = false;
             showInfo = false;
         }
@@ -284,7 +331,7 @@ public class WebContainerActivity extends BridgeActivity {
 
     }
 
-    private List<Class<? extends Plugin>> loadPlugins(){
+    private List<Class<? extends Plugin>> loadPlugins() {
 
         List<Class<? extends Plugin>> plugins = null;
 
@@ -301,9 +348,9 @@ public class WebContainerActivity extends BridgeActivity {
 
     private static boolean SW_DISABLED = false;
 
-    private static void disableServiceWorker(String originUrl, Bridge bridge){
+    private static void disableServiceWorker(String originUrl, Bridge bridge) {
 
-        if(SW_DISABLED) return;
+        if (SW_DISABLED) return;
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             ServiceWorkerController.getInstance().setServiceWorkerClient(new ServiceWorkerClient() {
@@ -311,11 +358,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);
                 }
             });
         }
@@ -338,7 +386,7 @@ public class WebContainerActivity extends BridgeActivity {
     }
 
 
-    private JSONObject readConfig(){
+    private JSONObject readConfig() {
 
         try {
 
@@ -351,7 +399,7 @@ public class WebContainerActivity extends BridgeActivity {
             JSONObject jo = new JSONObject(joStr);
 
             return jo;
-        }catch(Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -366,7 +414,7 @@ public class WebContainerActivity extends BridgeActivity {
         boolean canBack = this.bridge.getWebView().canGoBack();
 
         System.out.println("WebContainerActivity onBackPressed can back:" + canBack);
-        if(!canBack){
+        if (!canBack) {
             finish();
         }
     }
@@ -377,6 +425,7 @@ public class WebContainerActivity extends BridgeActivity {
         public Activity activity;
         private String TAG = "BypassWebViewClient";
         List<String> externalProtocols;
+
         public BypassWebViewClient(Bridge bridge) {
             super(bridge);
         }
@@ -391,6 +440,7 @@ public class WebContainerActivity extends BridgeActivity {
             }
             return false;
         }
+
         public boolean shouldOverrideUrl(WebView view, String url) {
             if (url.startsWith(WebView.SCHEME_TEL)) {
                 try {
@@ -454,17 +504,25 @@ 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;
 
-            return super.shouldInterceptRequest(view, request);
+//            if(url.indexOf("/scan?") > 0 || url.indexOf("/qr?") > 0 || url.indexOf("//scan") > 0){
+//                return null;
+//            }
+
+//            return super.shouldInterceptRequest(view, request);
 
-            //super.shouldInterceptRequest(view, request);
-            //return null;
         }
 
 
@@ -499,14 +557,14 @@ public class WebContainerActivity extends BridgeActivity {
         }
 
         @Override
-        public void onPageFinished (WebView view, String url){
+        public void onPageFinished(WebView view, String url) {
 
             debug("onPageFinished", url);
             //bridge.getWebView().setVisibility(View.VISIBLE);
         }
 
         @Override
-        public void onReceivedError (WebView view, int errorCode, String description, String failingUrl){
+        public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
             debug("onReceivedErrorOld", errorCode, description, failingUrl);
 
             initLayout(false, true, true);
@@ -523,5 +581,4 @@ public class WebContainerActivity extends BridgeActivity {
     }
 
 
-
 }

package/ios/Plugin/WebContainerViewController.swift

@@ -14,8 +14,10 @@ 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://", "weixin://"
+        "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 {
@@ -97,6 +99,7 @@ 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>
@@ -165,6 +168,22 @@ extension WebContainerViewController: WKNavigationDelegate {
             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
@@ -263,7 +282,20 @@ 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) {

package/package.json

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