Merge pull request #397 from easemob/alpha

Alpha

Author: dujiepeng

android/src/main/java/com/easemob/im_flutter_sdk/EMChatManagerWrapper.java

@@ -215,7 +215,7 @@ private void recallMessage(JSONObject param, String channelName, Result result)
                 if (msg != null) {
                     EMClient.getInstance().chatManager().recallMessage(msg);
                 }
-                onSuccess(result, channelName, true);
+                onSuccess(result, channelName, true);               
             } catch (HyphenateException e) {
                 onError(result, e);
             }
@@ -306,12 +306,14 @@ public void onProgress(int progress, String status) {
 
             @Override
             public void onError(int code, String desc) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("code", code);
+                data.put("description", desc);
                 post(() -> {
                     Map<String, Object> map = new HashMap<>();
                     map.put("message", EMMessageHelper.toJson(msg));
                     map.put("localTime", msg.localTime());
-                    map.put("code", code);
-                    map.put("description", desc);
+                    map.put("error", data);
                     messageChannel.invokeMethod(EMSDKMethod.onMessageError, map);
                 });
             }
@@ -348,12 +350,14 @@ public void onProgress(int progress, String status) {
 
             @Override
             public void onError(int code, String desc) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("code", code);
+                data.put("description", desc);
                 post(() -> {
                     Map<String, Object> map = new HashMap<>();
                     map.put("message", EMMessageHelper.toJson(msg));
                     map.put("localTime", msg.localTime());
-                    map.put("code", code);
-                    map.put("description", desc);
+                    map.put("error", data);
                     messageChannel.invokeMethod(EMSDKMethod.onMessageError, map);
                 });
             }

android/src/main/java/com/easemob/im_flutter_sdk/EMConversationWrapper.java

@@ -1,7 +1,5 @@
 package com.easemob.im_flutter_sdk;
-
 import android.text.TextUtils;
-
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;