*[android] fix model callback data from string to json

alibaba · Jun 28, 2016 · 3aed566 · 3aed566
1 parent 62dc67c
commit 3aed566
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -42,7 +42,7 @@ android {
         ndk {
 //            moduleName "weexcore"
 //            cFlags "-I" + file(libsDir+"v8core").absolutePath
-//            ldLibs "log",libsDir + "libv8_base.a",libsDir + "libv8_snapshot.a"
+//            ldLibs "log",libsDir + "libv8_base_arm.a",libsDir + "libv8_snapshot_arm.a"
             abiFilters "armeabi","x86"
         }
     }

diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -539,30 +539,18 @@ private void addUITask(String method, String instanceId, Object... args) {
 
   /**
    * Invoke JavaScript callback
-   * @see #callback(String, String, String, boolean)
+   * @see #callback(String, String, String)
    */
-  public void callback(String instanceId, String callback,
-                       Map<String, Object> data) {
-    callback(instanceId, callback,
-             data == null ? "{}" : WXJsonUtils.fromObjectToJSONString(data));
+  public void callback(String instanceId, String callback,String data) {
+    callback(instanceId, callback,data,false);
   }
 
   /**
    * Invoke JavaScript callback
-   * @see #callback(String, String, String, boolean)
-   */
-  public void callback(String instanceId, String callback,
-                       Map<String, Object> data,boolean keepAlive) {
-    callback(instanceId, callback,
-            data == null ? "{}" : WXJsonUtils.fromObjectToJSONString(data),keepAlive);
-  }
-
-  /**
-   * Invoke JavaScript callback
-   * @see #callback(String, String, String, boolean)
+   * @see #callback(String, String, Map<String, Object>)
    */
   public void callback(final String instanceId, final String callback,
-                       final String data){
+                       final Map<String, Object> data){
     callback(instanceId,callback,data,false);
   }
 
@@ -574,7 +562,7 @@ public void callback(final String instanceId, final String callback,
    * @param keepAlive if keep callback instance alive for later use
      */
   public void callback(final String instanceId, final String callback,
-                       final String data,boolean keepAlive) {
+                       final Object data,boolean keepAlive) {
     if (TextUtils.isEmpty(instanceId) || TextUtils.isEmpty(callback)
         || mJSHandler == null) {
       return;