fix:撤销消息:observeDeleteMessage撤销后删除消息事件

Author: xhp

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

@@ -67,6 +67,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";//'录音状态'

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;