Skip to content

Commit 2e70ffe

Browse files
committed
fix:过滤接收拆红包,撤销过滤
1 parent 2b78c69 commit 2e70ffe

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,13 @@ public class MessageUtil {
2929
return false;
3030
}
3131

32+
public static boolean shouldIgnoreRevoke(IMMessage message) {//TODO;
33+
if (message.getMsgType() == MsgTypeEnum.custom && message.getAttachment() != null
34+
&& (message.getAttachment() instanceof RedPacketAttachement
35+
|| message.getAttachment() instanceof BankTransferAttachment)) {
36+
// 红包 转账 不允许转发
37+
return true;
38+
}
39+
return false;
40+
}
3241
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,7 @@ public int onResult(int code, IMMessage message) {
12321232
if (result == 0) {
12331233
showTip("请选择消息");
12341234
} else if (result == 1) {
1235-
showTip("该类型不支持转发");
1235+
showTip("该类型消息不支持转发");
12361236
} else {
12371237
promise.resolve(ResponseCode.RES_SUCCESS + "");
12381238
}
@@ -1270,6 +1270,8 @@ public int onResult(int code, IMMessage message) {
12701270
});
12711271
if (result == 0) {
12721272
showTip("请选择消息");
1273+
}else if (result == 1) {
1274+
showTip("该类型消息不支持撤销");
12731275
}
12741276
return 0;
12751277
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ public void onIncomingMessage(@NonNull List<IMMessage> messages) {
125125
if (addedListItems.size() > 0) {
126126
updateShowTimeItem(addedListItems, false);
127127
}
128-
129-
refreshMessageList(addedListItems);
128+
List<IMMessage> r = onQuery(messages);
129+
refreshMessageList(r);
130130

131131
}
132132

@@ -722,6 +722,9 @@ public int revokeMessage(final IMMessage selectMessage, final OnSendMessageListe
722722
if (selectMessage == null) {
723723
return 0;
724724
}
725+
if (MessageUtil.shouldIgnoreRevoke(selectMessage)) {
726+
return 1;
727+
}
725728
getMsgService().revokeMessage(selectMessage).setCallback(new RequestCallbackWrapper<Void>() {
726729
@Override
727730
public void onResult(int code, Void aVoid, Throwable throwable) {

0 commit comments

Comments
 (0)