home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-21 18:56:29 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix the place for mark as readed

Browse Source
This commit is contained in:
kevinzhow
2015-05-30 23:34:36 +08:00
parent 37232a906a
commit 6a49d04519
1 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/ViewControllers/Conversation/ConversationViewController.swift
+38 -24
View File
@@ -543,18 +543,23 @@ class ConversationViewController: BaseViewController {
func removeSendStates() {
var messageStates = statesOfConversation(self.conversation, MessageSendState.Successed.rawValue, nil, inRealm: self.realm)
if let lastMessage = messageStates.last {
println("Message \(lastMessage.refMessageID) count before send \(self.messages.count) \(self.displayedMessagesRange.length)")
var sendStates = statesOfConversation(self.conversation, MessageSendState.Successed.rawValue, lastMessage.refMessageID, inRealm: self.realm)
var indexPaths = [NSIndexPath]()
var newMessageState = messageStates.count - sendStates.count
if sendStates.count < 1 {
return
}
var indexPaths = [NSIndexPath]()
for sendState in sendStates {
if let indexInMessage = self.messages.indexOf(sendState) {
var reverseIndex = (self.messages.count - indexInMessage - 1)
var reverseIndex = (self.messages.count - indexInMessage - newMessageState)
var actuallIndexInCollectionView = self.displayedMessagesRange.length - reverseIndex
var newIndexPath = NSIndexPath(forItem: actuallIndexInCollectionView, inSection: 0)
indexPaths.append(newIndexPath)
@@ -614,33 +619,40 @@ class ConversationViewController: BaseViewController {
}
// 防止未在此界面时被标记
if navigationController?.topViewController == self {
var messages = conversation.messages.filter({ message in
if let fromFriend = message.fromFriend {
return (message.readed == false) && (fromFriend.friendState != UserFriendState.Me.rawValue)
} else {
return false
}
})
var messages = conversation.messages.filter({ message in
if let fromFriend = message.fromFriend {
return (message.readed == false) && (fromFriend.friendState != UserFriendState.Me.rawValue)
} else {
return false
}
})
for message in messages {
markAsReadMessage(message, failureHandler: nil) { success in
dispatch_async(dispatch_get_main_queue()) {
let realm = Realm()
if let message = messageWithMessageID(message.messageID, inRealm: realm) {
realm.write {
message.readed = true
}
println("\(message.messageID) mark as read")
for message in messages {
markMessageAsReaded(message)
}
}
func markMessageAsReaded(message: Message) {
if navigationController?.topViewController == self {
markAsReadMessage(message, failureHandler: nil) { success in
dispatch_async(dispatch_get_main_queue()) {
let realm = Realm()
if let message = messageWithMessageID(message.messageID, inRealm: realm) {
realm.write {
message.readed = true
}
println("\(message.messageID) mark as read")
}
}
}
}
}
override func viewDidDisappear(animated: Bool) {
@@ -1442,7 +1454,7 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi
func updateMessagesStates() {
self.delay(0.5) {
self.delay(0.1) {
self.removeSendStates()
@@ -1505,6 +1517,8 @@ extension ConversationViewController: UICollectionViewDataSource, UICollectionVi
// TODO: 需要更好的下载与 mark as read 逻辑：也许未下载的也可以 mark as read
downloadAttachmentOfMessage(message)
markMessageAsReaded(message)
switch message.mediaType {
case MessageMediaType.Image.rawValue: