@aigens/aigens-sdk-core 0.0.34 → 0.0.36

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

@@ -62,12 +62,12 @@ public class WebContainerActivity extends BridgeActivity {
     private boolean ENVIRONMENT_PRODUCTION = true;
     private List<Class<? extends Plugin>> allPlugins;
     private String[] shouldRedirectList = new String[]{
-            "/scan?",
-            "/qr?",
-            "//scan",
-            "/api/v1/pay",
-            "/api/v1/wechat",
-            "/api/v1/qfpaywechat"
+        "/scan?",
+        "/qr?",
+        "//scan",
+        "/api/v1/pay",
+        "/api/v1/wechat",
+        "/api/v1/qfpaywechat"
     };
     private List<String> externalProtocols = new ArrayList<String>() {{
         add("octopus://");
@@ -104,6 +104,7 @@ 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 && totalUrl.startsWith(universalLink) && totalUrl.indexOf("redirect=") >= 0) {
                     redirectUrl = totalUrl.split("redirect=")[1];
@@ -135,19 +136,19 @@ public class WebContainerActivity extends BridgeActivity {
         Intent intent = getIntent();
 
         if (redirectUrl != null && !redirectUrl.equals("") && WebContainerActivity.perviousIntent != null) {
-            perviousIntent.putExtra("url", redirectUrl);
-            intent = perviousIntent;
+            WebContainerActivity.perviousIntent.putExtra("url", redirectUrl);
+            intent = WebContainerActivity.perviousIntent;
             currentInstanceState = WebContainerActivity.perviousInstanceState;
-            WebContainerActivity.perviousIntent = null;
-            WebContainerActivity.perviousInstanceState = null;
-        } else {
-            WebContainerActivity.perviousIntent = intent;
-            WebContainerActivity.perviousInstanceState = currentInstanceState;
         }
+        WebContainerActivity.perviousIntent = intent;
+        WebContainerActivity.perviousInstanceState = currentInstanceState;
 
 
         this.url = intent.getStringExtra("url");
 
+        // TEST
+//        this.url = "http://192.168.100.66:4200/crm/brand/220000/directory";
+
         //if navbar = true, show nav bar with "Done" button
         this.navbar = intent.getBooleanExtra("navbar", false);
 
@@ -222,20 +223,26 @@ public class WebContainerActivity extends BridgeActivity {
 
         }
 
+        // com.getcapacitor.community.firebaseanalytics.FirebaseAnalytics
         addExtraPlugins(new String[]{
-                "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",
+            "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",
         }, allPlugins);
         addExtraPlugins(intent.getStringArrayExtra("extraClasspaths"), allPlugins);
 
         debug("App plugins:" + allPlugins);
 
-        super.init(currentInstanceState, allPlugins, cc);
+//        super.init(currentInstanceState, allPlugins, cc);
+        this.bridgeBuilder.setPlugins(new ArrayList<>());
+        this.initialPlugins = allPlugins;
+        this.config = cc;
+        this.bridgeBuilder.setInstanceState(currentInstanceState);
+        this.load();
 
         //still have time to override webview client to avoid any intercept
 
@@ -278,6 +285,25 @@ public class WebContainerActivity extends BridgeActivity {
 
     }
 
+    @Override
+    protected void load() {
+        List<Class<? extends Plugin>> allPlugins = new ArrayList<>();
+        List<Class<? extends Plugin>> auto = loadPlugins();
+        for (Class c : auto) {
+
+            String clsName = c.getName();
+
+            if (clsName.endsWith("SplashScreenPlugin")) {
+                //don't add the splash screen plugin so it doesn't show the splash screen again
+            } else {
+                allPlugins.add(c);
+            }
+
+        }
+        this.bridgeBuilder.setPlugins(allPlugins);
+        super.load();
+    }
+
     private void addExtraPlugins(String[] extraClasspaths, List<Class<? extends Plugin>> plugins) {
         if (extraClasspaths == null) return;
         for (int i = 0; i < extraClasspaths.length; i++) {
@@ -418,10 +444,10 @@ public class WebContainerActivity extends BridgeActivity {
                 }
             } catch (Exception ex) {
                 Logger.error(
-                        "NativePlugin " +
-                                pluginClass.getName() +
-                                " is invalid. Ensure the @CapacitorPlugin annotation exists on the plugin class and" +
-                                " the class extends Plugin"
+                    "NativePlugin " +
+                        pluginClass.getName() +
+                        " is invalid. Ensure the @CapacitorPlugin annotation exists on the plugin class and" +
+                        " the class extends Plugin"
                 );
             }
         }
@@ -440,19 +466,19 @@ public class WebContainerActivity extends BridgeActivity {
             String cordovaPluginsFileJS = JSExport.getCordovaPluginsFileJS(this);
             String localUrlJS = "window.WEBVIEW_SERVER_URL = '" + this.url + "';";
             return (
-                    globalJS +
-                            "\n\n" +
-                            localUrlJS +
-                            "\n\n" +
-                            bridgeJS +
-                            "\n\n" +
-                            pluginJS +
-                            "\n\n" +
-                            cordovaJS +
-                            "\n\n" +
-                            cordovaPluginsFileJS +
-                            "\n\n" +
-                            cordovaPluginsJS
+                globalJS +
+                    "\n\n" +
+                    localUrlJS +
+                    "\n\n" +
+                    bridgeJS +
+                    "\n\n" +
+                    pluginJS +
+                    "\n\n" +
+                    cordovaJS +
+                    "\n\n" +
+                    cordovaPluginsFileJS +
+                    "\n\n" +
+                    cordovaPluginsJS
             );
         } catch (Exception ex) {
             Logger.error("Unable to export Capacitor JS. App will not function!", ex);
@@ -508,6 +534,16 @@ public class WebContainerActivity extends BridgeActivity {
 
             JSONObject jo = new JSONObject(joStr);
 
+            try {
+                JSONObject plugins = jo.optJSONObject("plugins");
+                JSONObject splashScreen = plugins.optJSONObject("SplashScreen");
+                splashScreen.putOpt("launchShowDuration", 0);
+                splashScreen.putOpt("launchAutoHide", true);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+
+
             return jo;
         } catch (Exception e) {
             e.printStackTrace();
@@ -562,7 +598,7 @@ public class WebContainerActivity extends BridgeActivity {
                     Log.e(TAG, "Error dialing " + url + ": " + e.toString());
                 }
             } else if (url.startsWith("geo:") || url.startsWith(WebView.SCHEME_MAILTO) || url.startsWith("market:")
-                    || loopExternalProtocols(url)) {
+                || loopExternalProtocols(url)) {
                 try {
                     Intent intent = new Intent(Intent.ACTION_VIEW);
                     intent.setData(Uri.parse(url));
@@ -656,15 +692,15 @@ public class WebContainerActivity extends BridgeActivity {
 
         private void injectJs(String content) {
             String str = "javascript:(function() { "
-                    + " " //turns to red the background color
-                    + " var script=document.createElement('script'); "
-                    + " script.setAttribute('type','text/javascript'); "
-                    + " script.setAttribute('id', 'test'); "
-                    + " script.innerText='"
-                    + content +
-                    "'; "
-                    + " document.getElementsByTagName('head')[0].appendChild(script); "
-                    + "})()";
+                + " " //turns to red the background color
+                + " var script=document.createElement('script'); "
+                + " script.setAttribute('type','text/javascript'); "
+                + " script.setAttribute('id', 'test'); "
+                + " script.innerText='"
+                + content +
+                "'; "
+                + " document.getElementsByTagName('head')[0].appendChild(script); "
+                + "})()";
 //            Log.wtf("injector", content);
             bridge.getWebView().evaluateJavascript(content, new ValueCallback<String>() {
                 @Override

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigens/aigens-sdk-core",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -57,7 +57,7 @@
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "swiftlint": "^1.0.1",
-    "typescript": "~4.0.3"
+    "typescript": "~4.1.5"
   },
   "peerDependencies": {
     "@capacitor/core": "^3.0.0"