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

Author: guangyao

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

@@ -31,10 +31,12 @@
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.friend.FriendService;
 import com.netease.nimlib.sdk.friend.model.AddFriendNotify;
+import com.netease.nimlib.sdk.msg.MsgService;
 import com.netease.nimlib.sdk.msg.attachment.AudioAttachment;
 import com.netease.nimlib.sdk.msg.attachment.ImageAttachment;
 import com.netease.nimlib.sdk.msg.attachment.LocationAttachment;
 import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
+import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment;
 import com.netease.nimlib.sdk.msg.attachment.VideoAttachment;
 import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum;
 import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
@@ -50,6 +52,7 @@
 import com.netease.nimlib.sdk.uinfo.UserInfoProvider;
 import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,6 +70,8 @@ public class ReactCache {
     public final static String observeFriend = "observeFriend";//'联系人'
     public final static String observeTeam = "observeTeam";//'群组'
     public final static String observeReceiveMessage = "observeReceiveMessage";//'接收消息'
+
+    public final static String observeDeleteMessage = "observeDeleteMessage";//'撤销后删除消息'
     public final static String observeReceiveSystemMsg = "observeReceiveSystemMsg";//'系统通知'
     public final static String observeMsgStatus = "observeMsgStatus";//'发送消息状态变化'
     public final static String observeAudioRecord = "observeAudioRecord";//'录音状态'
@@ -137,6 +142,35 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                 map.putString("fromAccount", fromAccount);
 
                 String content = contact.getContent();
+                switch (contact.getMsgType()) {
+                    case text:
+                        return contact.getContent();
+                    case image:
+                        return "[图片]";
+                    case video:
+                        return "[视频]";
+                    case audio:
+                        return "[语音消息]";
+                    case location:
+                        return "[位置]";
+                    case tip:
+                        List<String> uuids = new ArrayList<>();
+                        uuids.add(contact.getRecentMessageId());
+                        List<IMMessage> messages = NIMClient.getService(MsgService.class).queryMessageListByUuidBlock(uuids);
+                        if (messages != null && messages.size() > 0) {
+                            content = messages.get(0).getContent();
+                        }
+                        break;
+                    case notification:
+                        if (sessionType == SessionTypeEnum.Team) {
+                            content = TeamNotificationHelper.getTeamNotificationText(contact.getContactId(),
+                                    contact.getFromAccount(),
+                                    (NotificationAttachment) contact.getAttachment());
+                        }
+                        break;
+                    default:
+                        break;
+                }
                 map.putString("time", TimeUtil.getTimeShowString(contact.getTime(), true));
 
                 String fromNick = "";
@@ -190,7 +224,7 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
 //                                if (sessionType == SessionTypeEnum.Team && !rpOpen.isSelf()) {
 //                                    content = "";
 //                                } else {
-                                    content = rpOpen.getTipMsg(false);
+                                content = rpOpen.getTipMsg(false);
 //                                }
                             }
                             break;

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

@@ -4,6 +4,8 @@
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.netease.im.MessageUtil;
 import com.netease.im.ReactCache;
 import com.netease.im.login.LoginService;
@@ -371,7 +373,8 @@ public void onEvent(IMMessage message) {
             }
 
             deleteItem(message, false);
-            MessageHelper.getInstance().onRevokeMessage(message);
+            revokMessage(message);
+//            MessageHelper.getInstance().onRevokeMessage(message);
         }
     };
     private UserInfoObservable.UserInfoObserver uinfoObserver;
@@ -701,6 +704,11 @@ public int sendForwardMessage(IMMessage selectMessage, final String sessionId, f
         return 2;
     }
 
+    void revokMessage(IMMessage message){
+        WritableMap msg = Arguments.createMap();
+        msg.putString("_id", message.getUuid());
+        ReactCache.emit(ReactCache.observeDeleteMessage,msg);
+    }
     public int revokeMessage(final IMMessage selectMessage, final OnSendMessageListener onSendMessageListener) {
         if (selectMessage == null) {
             return 0;
@@ -710,6 +718,7 @@ public int revokeMessage(final IMMessage selectMessage, final OnSendMessageListe
             public void onResult(int code, Void aVoid, Throwable throwable) {
                 if (code == ResponseCode.RES_SUCCESS) {
                     deleteItem(selectMessage, false);
+                    revokMessage(selectMessage);
                     MessageHelper.getInstance().onRevokeMessage(selectMessage);
                 }
                 if (onSendMessageListener != null) {

android/src/main/java/com/netease/im/uikit/session/helper/MessageHelper.java

@@ -42,6 +42,7 @@ public void onRevokeMessage(IMMessage item) {
             nick = item.getFromAccount().equals(LoginService.getInstance().getAccount()) ? "你" : "对方";
         }
         message.setContent(nick + "撤回了一条消息");
+//        message.setPushContent(nick + "撤回了一条消息");
         message.setStatus(MsgStatusEnum.success);
         CustomMessageConfig config = new CustomMessageConfig();
         config.enableUnreadCount = false;