Commit 50d804dc by Lee Munkyeong

協業メッセージHotFix

parent a915589b
...@@ -46,8 +46,13 @@ public class MessageInfoListJSON extends AcmsCommonJSON { ...@@ -46,8 +46,13 @@ public class MessageInfoListJSON extends AcmsCommonJSON {
chatMessageDto.shopMemberId = messageInfoJSON.getInt(ABookCommConstants.KEY.SHOP_MEMBER_ID); chatMessageDto.shopMemberId = messageInfoJSON.getInt(ABookCommConstants.KEY.SHOP_MEMBER_ID);
chatMessageDto.chatMessageId = messageInfoJSON.getInt(ABookCommConstants.KEY.MESSAGE_ID); chatMessageDto.chatMessageId = messageInfoJSON.getInt(ABookCommConstants.KEY.MESSAGE_ID);
chatMessageDto.message = messageInfoJSON.getString(ABookCommConstants.KEY.MESSAGE);
chatMessageDto.messageType = messageInfoJSON.getInt(ABookCommConstants.KEY.MESSAGE_TYPE); chatMessageDto.messageType = messageInfoJSON.getInt(ABookCommConstants.KEY.MESSAGE_TYPE);
if (ABookCommConstants.FLAG.MESSAGE_TYPE.COLLABORATION_START.equals(chatMessageDto.messageType)
|| ABookCommConstants.FLAG.MESSAGE_TYPE.COLLABORATION_END.equals(chatMessageDto.messageType)) {
chatMessageDto.message = messageInfoJSON.getJSONObject(ABookCommConstants.KEY.MESSAGE).toString();
} else {
chatMessageDto.message = messageInfoJSON.getString(ABookCommConstants.KEY.MESSAGE);
}
chatMessageDto.unreadCount = messageInfoJSON.getInt(ABookCommConstants.KEY.UNREAD_COUNT); chatMessageDto.unreadCount = messageInfoJSON.getInt(ABookCommConstants.KEY.UNREAD_COUNT);
if (messageInfoJSON.has(ABookCommConstants.KEY.TIME)) { if (messageInfoJSON.has(ABookCommConstants.KEY.TIME)) {
......
...@@ -104,7 +104,9 @@ public interface ABookCommConstants { ...@@ -104,7 +104,9 @@ public interface ABookCommConstants {
Integer TEXT = 0; Integer TEXT = 0;
Integer PHOTO = 1; Integer PHOTO = 1;
Integer VIDEO = 2; Integer VIDEO = 2;
Integer SYSTEM = 4; Integer SYSTEM = 3;
Integer COLLABORATION_START = 4;
Integer COLLABORATION_END = 5;
} }
Integer GROUP_REQUEST_ALL = 0; Integer GROUP_REQUEST_ALL = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment