Merge branch 'release/0.3.20'

# Conflicts:
#	dart_native/example/lib/android/unit_test.dart

Author: yulingtianxia

.travis.yml

@@ -27,7 +27,7 @@ jobs:
         - unzip -qq gradle-3.5-bin.zip
         - export GRADLE_HOME=$PWD/gradle-3.5
         - export PATH=$GRADLE_HOME/bin:$PATH
-        - git clone https://github.com/flutter/flutter.git -b stable --depth 1
+        - git clone https://github.com/flutter/flutter.git --depth 1 --branch 1.22.6
         - export PATH=./flutter/bin:$PATH
         - flutter doctor
         - yes | sdkmanager "platforms;android-29"
@@ -44,7 +44,7 @@ jobs:
         - brew install libimobiledevice
         - brew install ideviceinstaller
         - brew install ios-deploy
-        - git clone https://github.com/flutter/flutter.git -b stable --depth 1
+        - git clone https://github.com/flutter/flutter.git --depth 1 --branch 1.22.6
         - export PATH=./flutter/bin:$PATH
         - flutter doctor
       script:

dart_native/.vscode/launch.json

@@ -0,0 +1,32 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "dart_native",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "dart_native (profile mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "example",
+            "cwd": "example",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "example (profile mode)",
+            "cwd": "example",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        }
+    ]
+}

dart_native/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.20
+
+* [Feature] Support 64 bit on Android.
+
 ## 0.3.19
 
 * [Fix] Some crash on Android.

dart_native/android/CMakeLists.txt

@@ -18,7 +18,11 @@ add_library( # Specifies the name of the library.
 
              # Provides a relative path to your source file(s).
              src/main/jni/include/dart_api_dl.c
-             src/main/jni/dart_native.cpp )
+             src/main/jni/dart_native.cpp
+             src/main/jni/dn_type_convert.cpp
+             src/main/jni/dn_method_call.cpp
+             src/main/jni/dn_signature_helper.cpp
+             src/main/jni/dn_callback.cpp)
 
     find_library( # Sets the name of the path variable.
             log-lib

dart_native/android/src/main/java/com/dartnative/dart_native/ArrayListConverter.java

@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Created by huizzzhou on 3/26/21.
@@ -80,11 +82,11 @@ public double[] doubleListToArray(List<Double> arguments) {
     /************************object type list to array***************************************/
 
     public Object[] objectListToArray(List<Object> arguments) {
-        Object[] doubleArray = new Object[arguments.size()];
+        Object[] objectArray = new Object[arguments.size()];
         for (int i = 0; i < arguments.size(); i++) {
-            doubleArray[i] = arguments.get(i);
+            objectArray[i] = arguments.get(i);
         }
-        return doubleArray;
+        return objectArray;
     }
 
 
@@ -138,5 +140,14 @@ public List arrayToList(Object array) {
 
         return arrayList;
     }
-    
+
+    /************************set to list***************************************/
+
+    public List setToList(HashSet<Object> set) {
+        if (set == null || set.size() == 0) {
+            return new ArrayList();
+        }
+
+        return new ArrayList<Object>(set);
+    }
 }

dart_native/android/src/main/java/com/dartnative/dart_native/CallbackInvocationHandler.java

@@ -12,27 +12,33 @@
 public class CallbackInvocationHandler implements InvocationHandler {
     private static final String TAG = "CallbackHandler";
 
-    private static HashMap<Class<?>, String> sTypeConvert = new HashMap<Class<?>, String>() {{
-        put(int.class, "I");
-        put(float.class, "F");
-        put(double.class, "D");
-        put(boolean.class, "Z");
-        put(String.class, "Ljava/lang/String;");
+    private static final HashMap<String, String> sBasicTypeConvert = new HashMap<String, String>() {{
+        put("int", "java.lang.Integer");
+        put("float", "java.lang.Float");
+        put("double", "java.lang.Double");
+        put("boolean", "java.lang.Boolean");
+        put("byte", "java.lang.Byte");
+        put("short", "java.lang.Short");
+        put("long", "java.lang.Long");
+        put("char", "java.lang.Character");
     }};
 
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         Log.d(TAG, "invoke method: " + method.getName());
-        Class<?>[] paramTypes = method.getParameterTypes();
-        String[] params = new String[paramTypes.length];
-        for (int i = 0; i < paramTypes.length; i++) {
-            params[i] = sTypeConvert.get(paramTypes[i]);
+        int argumentLength = args == null ? 0 : args.length;
+        String[] paramsType = new String[argumentLength];
+        for (int i = 0; i < argumentLength; i++) {
+            paramsType[i] = args[i] != null ? args[i].getClass().getName() : null;
         }
+
         String funName = method.getName();
-        String returnType = sTypeConvert.get(method.getReturnType());
-        long dartObjectAddr = CallbackManager.getInstance().getRegisterDartAddr(proxy);
-        return hookCallback(dartObjectAddr, funName, paramTypes.length, params, args, returnType);
+        String returnType = method.getReturnType().getName();
+        returnType = sBasicTypeConvert.get(returnType) == null ? returnType : sBasicTypeConvert.get(returnType);
+        long dartObjectAddress = CallbackManager.getInstance().getRegisterDartAddr(proxy);
+
+        return hookCallback(dartObjectAddress, funName, argumentLength, paramsType, args, returnType);
     }
 
-    static native Object hookCallback(long dartObjectAddr, String funName, int argCount, String[] argTypes, Object[] args, String returnType);
+    static native Object hookCallback(long dartObjectAddress, String funName, int argCount, String[] argTypes, Object[] args, String returnType);
 }