Merge pull request #54 from dart-native/feature/android_string

Feature/android string

Author: yulingtianxia

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/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);
 }