@aigens/aigens-sdk-core 0.5.3 → 0.5.5

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

@@ -1,6 +1,8 @@
 package com.aigens.sdk;
 
 import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.res.AssetManager;
@@ -34,6 +36,7 @@ import com.getcapacitor.BridgeActivity;
 import com.getcapacitor.BridgeWebViewClient;
 import com.getcapacitor.CapConfig;
 import com.getcapacitor.JSExport;
+import com.getcapacitor.JSObject;
 import com.getcapacitor.Logger;
 import com.getcapacitor.NativePlugin;
 import com.getcapacitor.Plugin;
@@ -97,6 +100,10 @@ public class WebContainerActivity extends BridgeActivity {
         add("aigenshkfps/true");
     }};
 
+    static List<String> exitUniversalLinks = new ArrayList<String>() {{
+//        add("phhkdownloadapp=true&requireMember");
+    }};
+
     private void debug(Object... msgs) {
 
 
@@ -117,6 +124,23 @@ public class WebContainerActivity extends BridgeActivity {
         return false;
     }
 
+    private boolean isExitUniversalLink() {
+        CorePlugin corePlugin = CorePlugin.getCoreInstance();
+        if (corePlugin == null || WebContainerActivity.exitUniversalLinks.size() == 0) return false;
+        JSObject object = corePlugin._readClipboard();
+        String url = object.getString("value");
+        // Log.i("Jason","onNewIntent 2"+url);
+        for (String p : WebContainerActivity.exitUniversalLinks) {
+            if (url != null && url != "" && url.contains(p)) {
+                corePlugin.forceDismiss();
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+
     private String getRedirectUrl(Intent intent) {
         try {
 //            Intent intent = getIntent();
@@ -139,6 +163,7 @@ public class WebContainerActivity extends BridgeActivity {
                 if (isExcludedUniversalLink(totalUrl)) {
                     return null;
                 }
+
                 // Log.i("Jason totalUrl", totalUrl+universalLink);
                 if (totalUrl != null && totalUrl.indexOf("redirect=") >= 0) {
                     redirectUrl = totalUrl.split("redirect=")[1];
@@ -167,6 +192,33 @@ public class WebContainerActivity extends BridgeActivity {
 
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Log.i("Jason","onNewIntent 1");
+        new Handler().postDelayed(() -> {
+            if (getWindow().getDecorView().hasFocus()) {
+                // Log.i("Jason","onNewIntent 2.1");
+                isExitUniversalLink();
+            } else {
+                // 强制请求焦点
+                getWindow().getDecorView().requestFocus();
+                getWindow().getDecorView().addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                                               int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        if (v.hasFocus()) {
+                            // Log.i("Jason","onNewIntent 2.3");
+                            isExitUniversalLink();
+                            v.removeOnLayoutChangeListener(this);
+                        }
+                    }
+                });
+            }
+        }, 300);
+        // Log.i("Jason","onNewIntent 2");
+    }
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -201,9 +253,10 @@ public class WebContainerActivity extends BridgeActivity {
 
         super.onCreate(currentInstanceState);
 
+        setContentView(com.aigens.sdk.R.layout.sdk_layout_main);
+
         addChannel();
 
-        setContentView(com.aigens.sdk.R.layout.sdk_layout_main);
 
         Intent intent = getIntent();
 
@@ -249,6 +302,13 @@ public class WebContainerActivity extends BridgeActivity {
             }
         }
 
+        List<String> exitUniversalLinks = (List<String>) intent.getSerializableExtra("exitUniversalLinks");
+        if (exitUniversalLinks != null) {
+            for (String s : exitUniversalLinks) {
+                WebContainerActivity.exitUniversalLinks.add(s);
+            }
+        }
+
         if (this.member != null) {
             CorePlugin.setMember(this.member);
         }
@@ -505,12 +565,25 @@ public class WebContainerActivity extends BridgeActivity {
         }
 
         View info = findViewById(R.id.info);
-        info.setVisibility(showInfo ? View.VISIBLE : View.INVISIBLE);
+        if (info == null) {
+            setContentView(com.aigens.sdk.R.layout.sdk_layout_main);
+            info = findViewById(R.id.info);
+        }
+
+        if (info != null) {
+            info.setVisibility(showInfo ? View.VISIBLE : View.INVISIBLE);
+        }
+
 
         View error = findViewById(R.id.error);
-        error.setVisibility(showError ? View.VISIBLE : View.INVISIBLE);
+        if (error != null) {
+            error.setVisibility(showError ? View.VISIBLE : View.INVISIBLE);
+        }
+
+        if (bridge.getWebView() != null) {
+            bridge.getWebView().setVisibility(showWeb ? View.VISIBLE : View.INVISIBLE);
+        }
 
-        bridge.getWebView().setVisibility(showWeb ? View.VISIBLE : View.INVISIBLE);
 
 
     }

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

@@ -14,6 +14,8 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
+import android.util.ArrayMap;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebSettings;
@@ -23,11 +25,13 @@ import androidx.activity.result.ActivityResult;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.aigens.sdk.WebContainerActivity;
+import com.getcapacitor.Bridge;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PermissionState;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
+import com.getcapacitor.PluginHandle;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.ActivityCallback;
 import com.getcapacitor.annotation.CapacitorPlugin;
@@ -37,6 +41,7 @@ import com.getcapacitor.annotation.PermissionCallback;
 import org.json.JSONException;
 
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -88,6 +93,25 @@ public class CorePlugin extends Plugin {
         CorePlugin.ENVIRONMENT_PRODUCTION = ENVIRONMENT_PRODUCTION;
     }
 
+    public static Bridge staticBridge = null;
+
+    public static CorePlugin getCoreInstance() {
+        if (staticBridge != null && staticBridge.getWebView() != null) {
+            PluginHandle handle = staticBridge.getPlugin("Core");
+            if (handle == null) {
+                return null;
+            }
+            return (CorePlugin) handle.getInstance();
+        }
+        return null;
+    }
+
+    @Override
+    public void load() {
+        super.load();
+        staticBridge = this.bridge;
+    }
+
     @Override
     protected void handleOnStart() {
 
@@ -139,6 +163,31 @@ public class CorePlugin extends Plugin {
     //    barcodeLauncher.launch(new ScanOptions());
     //}
 
+    public void forceDismiss() {
+        JSObject options = new JSObject();
+        if (options != null) {
+            Intent data = new Intent();
+            data.putExtra("closedData", options.toString());
+            getActivity().setResult(Activity.RESULT_OK, data);
+
+            try {
+                if (dismissCall != null) {
+                    JSObject result = new JSObject();
+                    result.put("closedData", options);
+                    dismissCall.resolve(result);
+                    dismissCall = null;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
+
+    }
+
     @PluginMethod()
     public void finish(PluginCall call) {
 
@@ -153,6 +202,7 @@ public class CorePlugin extends Plugin {
                     JSObject result = new JSObject();
                     result.put("closedData", options);
                     dismissCall.resolve(result);
+                    dismissCall = null;
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -168,7 +218,7 @@ public class CorePlugin extends Plugin {
     @PluginMethod()
     public void dismiss(PluginCall call) {
 
-        JSObject options = call.getObject("closedData");
+        JSObject options = call.getObject("closedData", new JSObject());
         if (options != null) {
             Intent data = new Intent();
             data.putExtra("closedData", options.toString());
@@ -179,6 +229,7 @@ public class CorePlugin extends Plugin {
                     JSObject result = new JSObject();
                     result.put("closedData", options);
                     dismissCall.resolve(result);
+                    dismissCall = null;
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -208,6 +259,8 @@ public class CorePlugin extends Plugin {
 
         String url = call.getString("url");
 
+//        url = "http://192.168.1.105:11111/order/store/967302003724288/mode/takeaway?brandId=599961624702976";
+
         if (url == null) return;
 
         JSObject options = call.getObject("options", null);
@@ -271,6 +324,16 @@ public class CorePlugin extends Plugin {
             e.printStackTrace();
         }
 
+        JSArray exitUniversalLinks = call.getArray("exitUniversalLinks");
+        try {
+            if (exitUniversalLinks != null) {
+                List<String> es = exitUniversalLinks.toList();
+                intent.putExtra("exitUniversalLinks", (Serializable) es);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
         intent.putExtra("url", url);
         intent.putExtra("clearCache", clearCache);
         intent.putExtra("member", (Serializable) memMap);
@@ -449,9 +512,7 @@ public class CorePlugin extends Plugin {
         call.resolve();
 
     }
-
-    @PluginMethod
-    public void readClipboard(PluginCall call) {
+    public JSObject _readClipboard() {
         JSObject object = new JSObject();
         try {
             ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
@@ -492,6 +553,12 @@ public class CorePlugin extends Plugin {
             object.put("type", "text/plain");
             e.printStackTrace();
         }
+        return object;
+    }
+
+    @PluginMethod
+    public void readClipboard(PluginCall call) {
+        JSObject object = _readClipboard();
         call.resolve(object);
     }
 
@@ -564,8 +631,24 @@ public class CorePlugin extends Plugin {
                 ActivityManager.RecentTaskInfo taskInfo = tasks.get(0).getTaskInfo();
                 if (taskInfo.topActivity.getClassName().equals(WebContainerActivity.class.getName())) {
                     try {
-                        Class<?> activityClass = Class.forName(taskInfo.topActivity.getClassName());
-                        currentActivity = (Activity) activityClass.newInstance();
+                        Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
+                        Object activityThread = activityThreadClass.getMethod("currentActivityThread").invoke(null);
+                        Field activitiesField = activityThreadClass.getDeclaredField("mActivities");
+                        activitiesField.setAccessible(true);
+
+                        ArrayMap<?, ?> activities = (ArrayMap<?, ?>) activitiesField.get(activityThread);
+                        for (Object record : activities.values()) {
+                            Class<?> recordClass = record.getClass();
+                            Field activityField = recordClass.getDeclaredField("activity");
+                            activityField.setAccessible(true);
+                            Activity activity = (Activity) activityField.get(record);
+                            // 检查类名和是否存活
+                            if (activity.getClass().getName().equals(taskInfo.topActivity.getClassName())
+                                    && !activity.isFinishing()) {
+                                currentActivity = activity;
+                                break;
+                            }
+                        }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -575,16 +658,27 @@ public class CorePlugin extends Plugin {
         } else {
             List<ActivityManager.RunningTaskInfo> tasks = activityManager.getRunningTasks(1);
             if (tasks != null && !tasks.isEmpty()) {
-                ActivityManager.RunningTaskInfo taskInfo = tasks.get(0);
-                if (taskInfo.topActivity.getClassName().equals(WebContainerActivity.class.getName())) {
-                    try {
-                        Class<?> activityClass = Class.forName(taskInfo.topActivity.getClassName());
-                        currentActivity = (Activity) activityClass.newInstance();
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                ComponentName componentName = tasks.get(0).topActivity;
+                try {
+                    Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
+                    Object activityThread = activityThreadClass.getMethod("currentActivityThread").invoke(null);
+                    Field activitiesField = activityThreadClass.getDeclaredField("mActivities");
+                    activitiesField.setAccessible(true);
+
+                    HashMap<?, ?> activities = (HashMap<?, ?>) activitiesField.get(activityThread);
+                    for (Object record : activities.values()) {
+                        Class<?> recordClass = record.getClass();
+                        Field activityField = recordClass.getDeclaredField("activity");
+                        activityField.setAccessible(true);
+                        Activity activity = (Activity) activityField.get(record);
+                        if (activity.getClass().getName().equals(componentName.getClassName())
+                                && !activity.isFinishing()) {
+                            currentActivity = activity;
+                            break;
+                        }
                     }
-
-
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
         }
@@ -595,7 +689,7 @@ public class CorePlugin extends Plugin {
         }
 
         if (currentActivity instanceof WebContainerActivity) {
-            ((WebContainerActivity) currentActivity).openSecondBrowser(url, null, new WebContainerActivity.SecondBrowserInterface() {
+            ((WebContainerActivity) currentActivity).openSecondBrowser(url, serviceName, new WebContainerActivity.SecondBrowserInterface() {
                 @Override
                 public void secondBrowserInterfaceYuuLoginCallback(View targetView, String status, String yuuToken, String cardNo, String warning, boolean cancel) {
                     JSObject ret = new JSObject();

package/ios/Plugin/CorePlugin.swift

@@ -204,6 +204,16 @@ public class CorePlugin: CAPPlugin {
 
     }
 
+    public func forceDismiss() {
+        let r = ["closedData": [:]]
+        WebContainerViewController.closeCB?(r)
+        CorePlugin.dismissCall?.resolve(r)
+        CorePlugin.dismissCall = nil
+        DispatchQueue.main.async {
+            self.bridge?.viewController?.dismiss(animated: true);
+        }
+    }
+
     @objc func dismiss(_ call: CAPPluginCall) {
 
         aigensprint("CorePlugin dismiss")
@@ -224,6 +234,7 @@ public class CorePlugin: CAPPlugin {
             "success": true
             //"value": implementation.echo(value)
         ])
+        CorePlugin.dismissCall = nil
 
 
     }
@@ -260,6 +271,7 @@ public class CorePlugin: CAPPlugin {
             "success": true
             //"value": implementation.echo(value)
         ])
+        CorePlugin.dismissCall = nil
     }
 
     private static var dismissCall: CAPPluginCall?
@@ -320,6 +332,7 @@ public class CorePlugin: CAPPlugin {
         let externalProtocols = call.getArray("externalProtocols")
         let addPaddingProtocols = call.getArray("addPaddingProtocols")
         let excludedUniversalLinks = call.getArray("excludedUniversalLinks")
+        let exitUniversalLinks = call.getArray("exitUniversalLinks")
 
         let clearCache = call.getBool("clearCache") ?? false
         aigensDebug = call.getBool("debug") ?? false
@@ -349,6 +362,9 @@ public class CorePlugin: CAPPlugin {
             if (excludedUniversalLinks != nil) {
                 options["excludedUniversalLinks"] = excludedUniversalLinks as AnyObject
             }
+            if (exitUniversalLinks != nil) {
+                options["exitUniversalLinks"] = exitUniversalLinks as AnyObject
+            }
 
             bridgeVC.options = options;
 
@@ -510,9 +526,16 @@ public class CorePlugin: CAPPlugin {
         return str;
     }
 
-    @objc func readClipboard(_ call: CAPPluginCall) {
+    public func _readClipboard() -> [String: Any]?{
         if UIPasteboard.general.hasImages, let image = UIPasteboard.general.image, let str = getStringFromQr(image) {
-            call.resolve(["value": str, "type": "text/plain"])
+            return ["value": str, "type": "text/plain"]
+        }
+        return nil
+    }
+
+    @objc func readClipboard(_ call: CAPPluginCall) {
+        if let obj = _readClipboard() {
+            call.resolve(obj)
             return
         }
         call.resolve(["value": "", "type": ""])

package/ios/Plugin/WebContainerViewController.swift

@@ -44,6 +44,9 @@ import Capacitor
         "aigenshkfps=true",
         "aigenshkfps/true"
     ]
+    var exitUniversalLinks: [String] = [
+//        "phhkdownloadapp=true&requireMember"
+    ]
 
     let containerView = WebContainer.webContainer()
     var webContainerView: WebContainer {
@@ -135,6 +138,15 @@ import Capacitor
         NotificationCenter.default.addObserver(self, selector: #selector(self.handleUniversalLink(notification:)), name: Notification.Name.capacitorOpenUniversalLink, object: nil)
 
         NotificationCenter.default.addObserver(self, selector: #selector(self.handleUrlOpened(notification:)), name: Notification.Name.capacitorOpenURL, object: nil)
+
+        NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: OperationQueue.main) { [weak self] (_) in
+            if let this = self, let core = CorePlugin.getCoreInstance(), this.exitUniversalLinks.count > 0, let obj = core._readClipboard(), let value = obj["value"] as? String {
+                if this.isExitUniversalLinks(value) {
+                    core.forceDismiss()
+                }
+            }
+
+        }
     }
 
     private func isExcludedUniversalLink(_ url: String) -> Bool {
@@ -148,6 +160,17 @@ import Capacitor
         return result
     }
 
+    private func isExitUniversalLinks(_ url: String) -> Bool {
+        var result = false
+
+        exitUniversalLinks.forEach { (url_) in
+            if url.contains(url_) {
+                result = true
+            }
+        }
+        return result
+    }
+
     private func isParseUrl(_ url: String) -> Bool {
 
         if isExcludedUniversalLink(url) {
@@ -289,6 +312,10 @@ import Capacitor
             self.excludedUniversalLinks.append(contentsOf: excludedUniversalLinks)
         }
 
+        if let exitUniversalLinks = options?["exitUniversalLinks"] as? [String] {
+            self.exitUniversalLinks.append(contentsOf: exitUniversalLinks)
+        }
+
     }
 
     private func decodeURIComponent(_ url: URL) -> URL {

package/package.json

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