From 7c327d8da18160992ff490ffe912b9145fee2da2 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Fri, 12 Jun 2015 12:35:37 +0800 Subject: [PATCH] fake messageID for SectionDate message --- Yep/Realm/Models.swift | 1 + Yep/Services/YepServiceSync.swift | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Yep/Realm/Models.swift b/Yep/Realm/Models.swift index a62eeb1e..95bd4eb7 100644 --- a/Yep/Realm/Models.swift +++ b/Yep/Realm/Models.swift @@ -399,6 +399,7 @@ func tryCreateSectionDateMessageInConversation(conversation: Conversation, befor // insert a new SectionDate Message let newSectionDateMessage = Message() + newSectionDateMessage.messageID = "sectionDate-" + NSUUID().UUIDString newSectionDateMessage.conversation = conversation newSectionDateMessage.mediaType = MessageMediaType.SectionDate.rawValue newSectionDateMessage.createdUnixTime = message.createdUnixTime - 1 // 比新消息早一秒 diff --git a/Yep/Services/YepServiceSync.swift b/Yep/Services/YepServiceSync.swift index ae0f5a0f..4c884c0e 100644 --- a/Yep/Services/YepServiceSync.swift +++ b/Yep/Services/YepServiceSync.swift @@ -965,10 +965,10 @@ func syncMessageWithMessageInfo(messageInfo: JSONDictionary, inRealm realm: Real message.conversation = conversation - var createdSectionDateMessage = false + var sectionDateMessageID: String? tryCreateSectionDateMessageInConversation(conversation, beforeMessage: message, inRealm: realm) { sectionDateMessage in realm.add(sectionDateMessage) - createdSectionDateMessage = true + sectionDateMessageID = sectionDateMessage.messageID } // 纪录消息的 detail 信息 @@ -1050,8 +1050,8 @@ func syncMessageWithMessageInfo(messageInfo: JSONDictionary, inRealm realm: Real // Do furtherAction after sync //println("syncMessageWithMessageInfo do furtherAction") - if createdSectionDateMessage { - furtherAction?(messageIDs: ["", messageID]) + if let sectionDateMessageID = sectionDateMessageID{ + furtherAction?(messageIDs: [sectionDateMessageID, messageID]) } else { furtherAction?(messageIDs: [messageID]) }