[sdk] SDK 4.6.0更新到4.7.3&fix api

Author: xhp

android/libs/nim-basesdk-4.6.0.jar android/libs/nim-basesdk-4.7.3.jarandroid/libs/nim-basesdk-4.6.0.jar renamed to android/libs/nim-basesdk-4.7.3.jar

@@ -39,6 +39,7 @@
 import com.netease.nimlib.sdk.msg.MsgServiceObserve;
 import com.netease.nimlib.sdk.msg.model.CustomNotification;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
+import com.netease.nimlib.sdk.msg.model.RevokeMsgNotification;
 import com.netease.nimlib.sdk.uinfo.UserInfoProvider;
 import com.netease.nimlib.sdk.util.NIMUtil;
 
@@ -243,6 +244,10 @@ public String makeNotifyContent(String nick, IMMessage message) {
         public String makeTicker(String nick, IMMessage message) {
             return null; // 采用SDK默认文案
         }
+        @Override
+        public String makeRevokeMsgTip(String revokeAccount, IMMessage item) {
+            return MessageUtil.getRevokeTipContent(item, revokeAccount);
+        }
     };
 
 
@@ -288,14 +293,14 @@ public static boolean isApkDebugable(Context context) {
     }
 
     private static void registerMsgRevokeObserver() {
-        NIMClient.getService(MsgServiceObserve.class).observeRevokeMessage(new Observer<IMMessage>() {
+        NIMClient.getService(MsgServiceObserve.class).observeRevokeMessage(new Observer<RevokeMsgNotification>() {
             @Override
-            public void onEvent(IMMessage message) {
-                if (message == null) {
+            public void onEvent(RevokeMsgNotification message) {
+                if (message == null && message.getMessage() == null) {
                     return;
                 }
 
-                MessageHelper.getInstance().onRevokeMessage(message);
+                MessageHelper.getInstance().onRevokeMessage(message.getMessage());
             }
         }, true);
     }

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

@@ -1,11 +1,19 @@
 package com.netease.im;
 
+import android.text.TextUtils;
+
+import com.netease.im.login.LoginService;
 import com.netease.im.session.extension.BankTransferAttachment;
 import com.netease.im.session.extension.RedPacketAttachement;
+import com.netease.im.uikit.cache.TeamDataCache;
 import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum;
 import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum;
 import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
+import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
+import com.netease.nimlib.sdk.robot.model.RobotAttachment;
+import com.netease.nimlib.sdk.team.constant.TeamMemberType;
+import com.netease.nimlib.sdk.team.model.TeamMember;
 
 /**
  * Created by dowin on 2017/6/14.
@@ -38,4 +46,52 @@ public class MessageUtil {
         }
         return false;
     }
+
+    public static String getRevokeTipContent(IMMessage item, String revokeAccount) {
+
+        String fromAccount = item.getFromAccount();
+        if (item.getMsgType() == MsgTypeEnum.robot) {
+            RobotAttachment robotAttachment = (RobotAttachment) item.getAttachment();
+            if (robotAttachment.isRobotSend()) {
+                fromAccount = robotAttachment.getFromRobotAccount();
+            }
+        }
+
+        if (!TextUtils.isEmpty(
+                revokeAccount) && !revokeAccount.equals(fromAccount)) {
+            return getRevokeTipOfOther(item.getSessionId(), item.getSessionType(), revokeAccount);
+        } else {
+            String revokeNick = ""; // 撤回者
+            if (item.getSessionType() == SessionTypeEnum.Team) {
+                revokeNick = TeamDataCache.getInstance().getTeamMemberDisplayNameYou(item.getSessionId(), item.getFromAccount());
+            } else if (item.getSessionType() == SessionTypeEnum.P2P) {
+                revokeNick = item.getFromAccount().equals(LoginService.getInstance().getAccount()) ? "你" : "对方";
+            }
+            return revokeNick + "撤回了一条消息";
+        }
+    }
+
+    // 撤回其他人的消息时，获取tip
+    public static String getRevokeTipOfOther(String sessionID, SessionTypeEnum sessionType, String revokeAccount) {
+        if (sessionType == SessionTypeEnum.Team) {
+            String revokeNick = ""; // 撤回者
+
+            if (LoginService.getInstance().getAccount().equals(revokeAccount)) {
+                revokeNick = "你";
+            } else {
+                TeamMember member = TeamDataCache.getInstance().getTeamMember(sessionID, revokeAccount);
+
+                String revoker = TeamDataCache.getInstance().getDisplayNameWithoutMe(sessionID, revokeAccount);
+
+                if (member == null || member.getType() == TeamMemberType.Manager) {
+                    revokeNick = "管理员 " + revoker + " ";
+                } else if (member.getType() == TeamMemberType.Owner) {
+                    revokeNick = "群主 " + revoker + " ";
+                }
+            }
+            return revokeNick + "撤回了一条成员消息";
+        } else {
+            return "撤回了一条消息";
+        }
+    }
 }

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

@@ -51,8 +51,8 @@ public boolean onNotificationClicked(Context context, Map<String, String> payloa
     }
 
     @Override
-    public boolean cleanHuaWeiNotifications() {
-        return false;
+    public boolean cleanMixPushNotifications(int pushType) {
+        return true;
     }
 
     private ComponentName initLaunchComponent(Context context) {

android/src/main/java/com/netease/im/common/push/NimMixPushMessageHandler.java

@@ -55,6 +55,7 @@
 import com.netease.nimlib.sdk.msg.model.MemberPushOption;
 import com.netease.nimlib.sdk.msg.model.MessageReceipt;
 import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum;
+import com.netease.nimlib.sdk.msg.model.RevokeMsgNotification;
 import com.netease.nimlib.sdk.team.model.Team;
 
 import java.io.File;
@@ -408,9 +409,11 @@ public void onClearMessages(String account) {
     /**
      * 消息撤回观察者
      */
-    Observer<IMMessage> revokeMessageObserver = new Observer<IMMessage>() {
+    Observer<RevokeMsgNotification> revokeMessageObserver = new Observer<RevokeMsgNotification>() {
         @Override
-        public void onEvent(IMMessage message) {
+        public void onEvent(RevokeMsgNotification item) {
+            if (item == null) {return;}
+            IMMessage message = item.getMessage();
             if (message == null || sessionId == null || !sessionId.equals(message.getSessionId())) {
                 return;
             }