Merge branch 'master' of https://github.com/reactnativecomponent/react-native-netease-im

Author: guangyao

README.md

@@ -1,5 +1,6 @@
 
 React Native的网易云信插件
+欢迎加入QQ群交流`153174456`
 ## Demo
 [react-native-chat-demo](https://github.com/reactnativecomponent/react-native-chat-demo)
 

android/src/main/java/com/netease/im/MessageConstant.java

@@ -28,9 +28,9 @@ public class MsgType {
     public class MsgStatus {
 
         public final static String SEND_DRAFT = "send_draft";
-        public final static String SEND_FAILE = "send_fail";
-        public final static String SEND_SENDING = "send_sending";
-        public final static String SEND_SUCCESS = "send_success";
+        public final static String SEND_FAILE = "send_failed";
+        public final static String SEND_SENDING = "send_going";
+        public final static String SEND_SUCCESS = "send_succed";
         public final static String RECEIVE_READ = "receive_read";
         public final static String RECEIVE_UNREAD = "receive_unread";
     }
@@ -92,8 +92,8 @@ public static class Location {
     }
 
     public static class MediaFile {
-        public final static String HEIGHT = "height";
-        public final static String WIDTH = "width";
+        public final static String HEIGHT = "imageHeight";
+        public final static String WIDTH = "imageWidth";
         public final static String DISPLAY_NAME = "displayName";
         public final static String DURATION = "duration";
         public final static String THUMB_PATH = "thumbPath";

android/src/main/java/com/netease/im/session/SessionService.java

@@ -18,7 +18,9 @@
 import com.netease.im.session.extension.RedPacketAttachement;
 import com.netease.im.session.extension.RedPacketOpenAttachement;
 import com.netease.im.uikit.cache.TeamDataCache;
+import com.netease.im.uikit.common.util.file.FileUtil;
 import com.netease.im.uikit.common.util.log.LogUtil;
+import com.netease.im.uikit.common.util.media.ImageUtil;
 import com.netease.im.uikit.common.util.string.MD5;
 import com.netease.im.uikit.session.helper.MessageHelper;
 import com.netease.im.uikit.session.helper.MessageListPanelHelper;
@@ -67,7 +69,7 @@
 
 public class SessionService {
 
-    final static String TAG = "SessionService2";
+    final static String TAG = "SessionService";
 
     private static final int LOAD_MESSAGE_COUNT = 20;
 
@@ -653,6 +655,12 @@ public void sendTipMessage(String content, OnSendMessageListener onSendMessageLi
     public void sendImageMessage(String file, String displayName, OnSendMessageListener onSendMessageListener) {
         file = Uri.parse(file).getPath();
         File f = new File(file);
+        LogUtil.w(TAG, "path:" + f.getPath() + "-size:" + FileUtil.formatFileSize(f.length()));
+        File temp = ImageUtil.getScaledImageFileWithMD5(f, FileUtil.getMimeType(f.getPath()));
+        if (temp != null) {
+            f = temp;
+        }
+        LogUtil.w(TAG, "path:" + f.getPath() + "-size:" + FileUtil.formatFileSize(f.length()));
         IMMessage message = MessageBuilder.createImageMessage(sessionId, sessionTypeEnum, f, TextUtils.isEmpty(displayName) ? f.getName() : displayName);
         sendMessage(message, onSendMessageListener);
     }