@@ -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 ) {
0 commit comments