Skip to content

Commit 079b803

Browse files
guangyaoguangyao
guangyao
authored and
guangyao
committed
2 parents 938d820 + 9fbc043 commit 079b803

File tree

6 files changed

+45
-21
lines changed

6 files changed

+45
-21
lines changed

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class MsgType {
1313
public final static String VIDEO = "video";
1414
public final static String FILE = "file";
1515
public final static String ROBOT = "robot";
16-
public final static String BANK_TRANSFER = "bank_transfer";
16+
public final static String BANK_TRANSFER = "transfer";
1717
public final static String ACCOUNT_NOTICE = "account_notice";
1818
public final static String EVENT = "event";
1919
public final static String LOCATION = "location";
@@ -26,11 +26,13 @@ public class MsgType {
2626
}
2727

2828
public class MsgStatus {
29-
public final static String SEND_FAILED = "send_failed";
30-
public final static String SEND_GOING = "send_going";
31-
public final static String RECEIVE_FAILED = "receive_failed";
32-
public final static String RECEIVE_SUCCESS = "receive_success";
33-
public final static String RECEIVE_READED = "readed";
29+
30+
public final static String SEND_DRAFT = "send_draft";
31+
public final static String SEND_FAILE = "send_fail";
32+
public final static String SEND_SENDING = "send_sending";
33+
public final static String SEND_SUCCESS = "send_success";
34+
public final static String RECEIVE_READ = "receive_read";
35+
public final static String RECEIVE_UNREAD = "receive_unread";
3436
}
3537

3638
public class Message {
@@ -67,7 +69,7 @@ public static class AccountNotice {
6769
public final static String DATE = "date";
6870
public final static String AMOUNT = "amount";
6971
public final static String BODY = "body";
70-
public final static String SERIA_NO = "serialNo";
72+
public final static String SERIAL_NO = "serialNo";
7173
}
7274

7375
public static class BankTransfer {
@@ -104,12 +106,12 @@ public static class MediaFile {
104106
public static class RedPacket {
105107
public final static String TYPE = "type";
106108
public final static String COMMENTS = "comments";
107-
public final static String SERIA_NO = "seriaNo";
109+
public final static String SERIAL_NO = "serialNo";
108110
}
109111

110112
public static class RedPacketOpen {
111113
public final static String HAS_RED_PACKET = "hasRedPacket";
112-
public final static String SERIA_NO = "seriaNo";
114+
public final static String SERIAL_NO = "serialNo";
113115
public final static String TIP_MSG = "tipMsg";
114116

115117
public final static String SEND_ID = "sendId";

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment;
4141
import com.netease.nimlib.sdk.msg.attachment.VideoAttachment;
4242
import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum;
43+
import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum;
4344
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
4445
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
4546
import com.netease.nimlib.sdk.msg.constant.SystemMessageStatus;
@@ -785,6 +786,25 @@ static String getMessageType(IMMessage item) {
785786
return type;
786787
}
787788

789+
static String getMessageStatus(MsgStatusEnum statusEnum){
790+
switch (statusEnum){
791+
case draft:
792+
return MessageConstant.MsgStatus.SEND_DRAFT;
793+
case sending:
794+
return MessageConstant.MsgStatus.SEND_SENDING;
795+
case success:
796+
return MessageConstant.MsgStatus.SEND_SUCCESS;
797+
case fail:
798+
return MessageConstant.MsgStatus.SEND_FAILE;
799+
case read:
800+
return MessageConstant.MsgStatus.RECEIVE_READ;
801+
case unread:
802+
return MessageConstant.MsgStatus.RECEIVE_UNREAD;
803+
default:
804+
return MessageConstant.MsgStatus.SEND_DRAFT;
805+
}
806+
807+
}
788808
final static String MESSAGE_EXTEND = MessageConstant.Message.EXTEND;
789809

790810
/**
@@ -812,7 +832,7 @@ public static WritableMap createMessage(IMMessage item) {
812832
itemMap.putString(MessageConstant.Message.SESSION_TYPE, Integer.toString(item.getSessionType().getValue()));
813833

814834
itemMap.putString(MessageConstant.Message.IS_OUTGOING, Integer.toString(item.getDirect().getValue()));
815-
itemMap.putString(MessageConstant.Message.STATUS, Integer.toString(item.getStatus().getValue()));
835+
itemMap.putString(MessageConstant.Message.STATUS, getMessageStatus(item.getStatus()));
816836
itemMap.putString(MessageConstant.Message.ATTACH_STATUS, Integer.toString(item.getAttachStatus().getValue()));
817837
itemMap.putString(MessageConstant.Message.IS_REMOTE_READ, boolean2String(receiveReceiptCheck(item)));
818838

‎android/src/main/java/com/netease/im/session/extension/AccountNoticeAttachment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public WritableMap toReactNative() {
7676
writableMap.putString(MessageConstant.AccountNotice.TIME, time);
7777
writableMap.putString(MessageConstant.AccountNotice.DATE, date);
7878
writableMap.putString(MessageConstant.AccountNotice.AMOUNT, amount);
79-
writableMap.putString(MessageConstant.AccountNotice.SERIA_NO, serialNo);
79+
writableMap.putString(MessageConstant.AccountNotice.SERIAL_NO, serialNo);
8080
WritableMap bodyMap = Arguments.createMap();
8181
if (body != null && !body.isEmpty()) {
8282
Set<Map.Entry<String, Object>> entrySet = body.entrySet();

‎android/src/main/java/com/netease/im/session/extension/LinkUrlAttachment.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.alibaba.fastjson.JSONObject;
44
import com.facebook.react.bridge.Arguments;
55
import com.facebook.react.bridge.WritableMap;
6+
import com.netease.im.MessageConstant;
67

78
/**
89
* Created by dowin on 2017/6/14.
@@ -48,10 +49,10 @@ public String getTitle() {
4849
@Override
4950
public WritableMap toReactNative() {
5051
WritableMap writableMap = Arguments.createMap();
51-
writableMap.putString("title",title);
52-
writableMap.putString("describe",describe);
53-
writableMap.putString("image",image);
54-
writableMap.putString("linkUrl",linkUrl);
52+
writableMap.putString(MessageConstant.Link.TITLE,title);
53+
writableMap.putString(MessageConstant.Link.DESCRIBE,describe);
54+
writableMap.putString(MessageConstant.Link.IMAGE,image);
55+
writableMap.putString(MessageConstant.Link.LINK_URL,linkUrl);
5556
return writableMap;
5657
}
5758

‎android/src/main/java/com/netease/im/session/extension/RedPacketAttachement.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public WritableMap toReactNative(){
5454
WritableMap writableMap = Arguments.createMap();
5555
writableMap.putString(MessageConstant.RedPacket.TYPE,redPacketType);
5656
writableMap.putString(MessageConstant.RedPacket.COMMENTS,comments);
57-
writableMap.putString(MessageConstant.RedPacket.SERIA_NO,serialNo);
57+
writableMap.putString(MessageConstant.RedPacket.SERIAL_NO,serialNo);
5858
return writableMap;
5959
}
6060

‎android/src/main/java/com/netease/im/session/extension/RedPacketOpenAttachement.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.alibaba.fastjson.JSONObject;
66
import com.facebook.react.bridge.Arguments;
77
import com.facebook.react.bridge.WritableMap;
8+
import com.netease.im.MessageConstant;
89
import com.netease.im.login.LoginService;
910
import com.netease.im.uikit.cache.NimUserInfoCache;
1011

@@ -86,13 +87,13 @@ public String getTipMsg(boolean show) {
8687
@Override
8788
public WritableMap toReactNative() {
8889
WritableMap writableMap = Arguments.createMap();
89-
// writableMap.putString("sendId", sendId);
90+
writableMap.putString(MessageConstant.RedPacketOpen.SEND_ID, sendId);
9091
// writableMap.putString("sendName", sendName);
91-
// writableMap.putString("openId", openId);
92+
writableMap.putString(MessageConstant.RedPacketOpen.OPEN_ID, openId);
9293
// writableMap.putString("openName", openName);
93-
writableMap.putString("hasRedPacket", hasRedPacket);
94-
writableMap.putString("serialNo", serialNo);
95-
writableMap.putString("tipMsg", getTipMsg(true));
94+
writableMap.putString(MessageConstant.RedPacketOpen.HAS_RED_PACKET, hasRedPacket);
95+
writableMap.putString(MessageConstant.RedPacketOpen.SERIAL_NO, serialNo);
96+
writableMap.putString(MessageConstant.RedPacketOpen.TIP_MSG, getTipMsg(true));
9697
return writableMap;
9798
}
9899
}

0 commit comments

Comments
 (0)