Skip to content

Commit 3461d70

Browse files
author
Hevin
committed
Optimize the method of message to json
1 parent 6c2ed93 commit 3461d70

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

src/android/JsonUtils.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,23 @@ static JSONObject toJson(Message msg) {
127127
result.put("from", toJson(msg.getFromUser())); // 消息发送者
128128
result.put("isSend", msg.getDirect() == MessageDirect.send); // 消息是否是由当前用户发出
129129

130-
if (msg.getDirect() == MessageDirect.send) { // 消息发送
131-
if (msg.getTargetType() == ConversationType.single) { // 消息发送对象的类型
132-
result.put("target", toJson((UserInfo) msg.getTargetInfo()));
133-
} else if (msg.getTargetType() == ConversationType.group) {
134-
result.put("target", toJson((GroupInfo) msg.getTargetInfo()));
135-
}
136-
137-
} else if (msg.getDirect() == MessageDirect.receive) { // 消息接收
138-
if (msg.getTargetType() == ConversationType.single) {
139-
result.put("target", toJson(JMessageClient.getMyInfo()));
140-
} else if (msg.getTargetType() == ConversationType.group) {
141-
result.put("target", toJson((GroupInfo) msg.getTargetInfo()));
142-
}
130+
JSONObject targetJson = null;
131+
switch (msg.getTargetType()) {
132+
case single:
133+
if (msg.getDirect() == MessageDirect.send) { // 消息发送
134+
targetJson = toJson((UserInfo) msg.getTargetInfo());
135+
} else { // 消息接收
136+
targetJson = toJson(JMessageClient.getMyInfo());
137+
}
138+
break;
139+
case group:
140+
targetJson = toJson((GroupInfo) msg.getTargetInfo());
141+
break;
142+
case chatroom:
143+
targetJson = toJson((ChatRoomInfo) msg.getTargetInfo());
144+
break;
143145
}
146+
result.put("target", targetJson);
144147

145148
MessageContent content = msg.getContent();
146149
if (content.getStringExtras() != null) {

www/JMessagePlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ var JMessagePlugin = {
889889
exec(success, error, PLUGIN_NAME, 'exitChatRoom', [params])
890890
},
891891
/**
892-
* 获取聊天室会话信息。如果无法返回
892+
* 获取聊天室会话信息。
893893
*
894894
* @param {object} params = { roomId: String }
895895
* @param {function} success = function (conversation) {}

0 commit comments

Comments
 (0)