@aigens/aigens-sdk-core 0.4.6 → 0.5.1

package/android/build.gradle

@@ -1,8 +1,8 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
 
 }
 
@@ -12,17 +12,18 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30
+    namespace "com.aigens.sdk"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -37,8 +38,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aigens.sdk">
+    >
     <uses-permission android:name="android.permission.INTERNET" />
     <application android:hardwareAccelerated="true">
         <activity android:name=".WebContainerActivity"

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

@@ -449,31 +449,42 @@ public class CorePlugin extends Plugin {
     public void readClipboard(PluginCall call) {
         JSObject object = new JSObject();
         try {
-
             ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-            CharSequence value = null;
+            String value = "";
+            String type = "text/plain";
+
             if (clipboard.hasPrimaryClip()) {
-                if (clipboard.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
-                    ClipData.Item item = clipboard.getPrimaryClip().getItemAt(0);
-                    value = item.getText();
-                } else {
-                    ClipData.Item item = clipboard.getPrimaryClip().getItemAt(0);
-                    value = item.coerceToText(getContext()).toString();
+                ClipData clipData = clipboard.getPrimaryClip();
+                if (clipData != null && clipData.getItemCount() > 0) {
+                    ClipData.Item item = clipData.getItemAt(0);
+                    ClipDescription description = clipData.getDescription();
+
+                    // 优先使用系统报告的MIME类型
+                    if (description != null && description.getMimeTypeCount() > 0) {
+                        type = description.getMimeType(0);
+                    }
+
+                    // 获取剪贴板内容
+                    CharSequence text = item.getText();
+                    if (text != null) {
+                        value = text.toString();
+                    } else {
+                        // 处理非文本内容
+                        value = item.coerceToText(getContext()).toString();
+
+                        // 如果系统未报告类型，检查URI格式
+                        if (type.equals("text/plain") && value.startsWith("data:")) {
+                            type = value.split(";")[0].split(":")[1];
+                        }
+                    }
                 }
             }
-            String type = "text/plain";
-            if (value != null) {
-                object.put("value", value.toString());
-            }else {
-                object.put("value", "");
-            }
-            if (value != null && value.toString().startsWith("data:")) {
-                type = value.toString().split(";")[0].split(":")[1];
-            }
+
+            object.put("value", value);
             object.put("type", type);
         } catch (Exception e) {
             object.put("value", "");
-            object.put("type", "");
+            object.put("type", "text/plain");
             e.printStackTrace();
         }
         call.resolve(object);

package/ios/Plugin/CorePlugin.swift

@@ -100,18 +100,13 @@ public class CorePlugin: CAPPlugin {
         let typeIdentifier = call.getString("typeIdentifier", "hk.com.hkicl");
 
         let paymentData: [String: Any] = ["URL": paymentRequestUrl, "callback": callbackUrl]
-//        let jsonData = try! JSONSerialization.data(withJSONObject: paymentData, options: [])
-//        let itemProvider = NSItemProvider(item: jsonData as NSSecureCoding, typeIdentifier: typeIdentifier)
         let itemProvider = NSItemProvider(item: paymentData as NSSecureCoding, typeIdentifier: typeIdentifier)
         let extensionItem = NSExtensionItem()
         extensionItem.attachments = [itemProvider]
 
-        // Invoke UIActivityViewController to choose Payment App
         let activityViewController = UIActivityViewController(activityItems: [extensionItem], applicationActivities: nil)
 
         activityViewController.completionWithItemsHandler = { (activityType, completed, returnedItems, activityError) in
-            // Start the activity chosen to complete the payment
-            print("Start the activity chosen to complete the payment : \(completed)")
             if !completed {
                 CorePlugin.HKFPSCall?.keepAlive = false;
                 CorePlugin.HKFPSCall = nil;
@@ -119,7 +114,6 @@ public class CorePlugin: CAPPlugin {
         }
         DispatchQueue.main.async {
             self.bridge?.viewController?.present(activityViewController, animated: true, completion: nil)
-
             call.keepAlive = true;
             CorePlugin.HKFPSCall = call;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigens/aigens-sdk-core",
-  "version": "0.4.6",
+  "version": "0.5.1",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -44,10 +44,10 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^4.6.1",
-    "@capacitor/core": "^4.6.1",
-    "@capacitor/docgen": "^0.2.0",
-    "@capacitor/ios": "^4.6.1",
+    "@capacitor/android": "^5.0.0",
+    "@capacitor/core": "^5.0.0",
+    "@capacitor/docgen": "^0.2.2",
+    "@capacitor/ios": "^5.0.0",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "^1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -60,7 +60,7 @@
     "typescript": "~4.8"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.6.1"
+    "@capacitor/core": "^5.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",