sendnewmessage

Author: HarriesChen

MessageKit.xcodeproj/project.pbxproj

@@ -33,7 +33,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E5C440501C8EE20600E40000"
+               BlueprintIdentifier = "E5DB76441C8FD040006B599B"
                BuildableName = "MessageKitTests.xctest"
                BlueprintName = "MessageKitTests"
                ReferencedContainer = "container:MessageKit.xcodeproj">

MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKit.xcscheme

@@ -55,11 +55,18 @@ public final class FileBubbleView: UIView, MaximumLayoutWidthSpecificable, Backg
     private lazy var folderIconView: UIView = {
         let iconView = UIView()
         iconView.addSubview(self.coverImageView)
+        iconView.addSubview(self.typeLabel)
         return iconView
     }()
 
     private var borderImageView: UIImageView = UIImageView()
     private var coverImageView: UIImageView = UIImageView()
+    private lazy var typeLabel: UILabel = {
+        let typeLabel = UILabel()
+        typeLabel.font = UIFont.systemFontOfSize(10)
+        typeLabel.textColor = UIColor.whiteColor()
+        return typeLabel
+    }()
     private var titleLabel: UILabel = UILabel()
     private var sizeLabel: UILabel = UILabel()
 
@@ -120,6 +127,8 @@ public final class FileBubbleView: UIView, MaximumLayoutWidthSpecificable, Backg
         self.sizeLabel.text = viewModel.fileSize
         self.sizeLabel.font = fileMessageStyle.textFont(viewModel: viewModel, isSelected: self.selected)
         self.sizeLabel.sizeToFit()
+        self.typeLabel.text = "PSD"
+        self.typeLabel.sizeToFit()
         self.setNeedsLayout()
     }
 
@@ -138,6 +147,7 @@ public final class FileBubbleView: UIView, MaximumLayoutWidthSpecificable, Backg
         self.borderImageView.bma_rect = self.bubbleImageView.bounds
         self.titleLabel.bma_rect = CGRect(origin: layout.fileTitleLabelFrame, size: titleLabel.frame.size)
         self.sizeLabel.bma_rect = CGRect(origin: layout.fileSizeLabelFrame, size: sizeLabel.frame.size)
+        self.typeLabel.center = self.coverImageView.center
     }
 
     private func calculateFileBubbleLayout(maximumWidth maximumWidth: CGFloat) -> FileBubbleLayoutModel {
@@ -182,7 +192,7 @@ private class FileBubbleLayoutModel {
         currentX += 15
         folderIconFrame.origin.x = currentX
         currentX += folderIconFrame.size.width
-        currentX += 10
+        currentX += 8
         fileTitleLabelFrame.x = currentX
         fileSizeLabelFrame.x = currentX
 

MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKitTests.xcscheme

@@ -27,7 +27,7 @@ public class FileMessageCollectionViewCellDefaultStyle: FileMessageCollectionVie
     }()
 
     lazy var titleFont = {
-        return UIFont.systemFontOfSize(17)
+        return UIFont.systemFontOfSize(16)
     }()
 
     lazy var textFont = {

MessageKit/FileBubbleView.swift

@@ -16,7 +16,7 @@ public protocol MessageDataSourceProtocol: class {
 
     var hasMoreNext: Bool { get }
     var hasMorePrevious: Bool { get }
-    var messageItems: [MessageItemProtocol] { get }
+    var messageItems: [MessageItemProtocol] { get set }
     weak var delegate: MessageDataSourceDelegateProtocol? { get set }
 
     func loadNext(completion: () -> Void)

MessageKit/FileMessageCollectionViewCellDefaultStyle.swift

@@ -57,12 +57,10 @@ public class MessageViewController: UIViewController, UICollectionViewDataSource
     }
 
     public func sendNewMessage(message: MessageItemProtocol) {
-        
-//        var newItem = messageDataSource?.messageItems
-//        newItem?.append(message)
-//        let newDataSource = messageDataSource
-//
-//        
+        var newItem = self.messageDataSource?.messageItems
+        newItem?.append(message)
+        self.messageDataSource?.messageItems = newItem!
+        enqueueModelUpdate(context: .Normal)
     }
 
 

MessageKit/MessageDataSourceProtocol.swift

@@ -173,7 +173,7 @@ class ViewController: MessageViewController {
                 let photoMessageModelIncoming = PhotoMessageModel(messageModel: baseMessageModel, imageSize: CGSize(width: 300, height: 600), image: UIImage(named: "hujiang")!)
                 source.append(photoMessageModelIncoming)
             } else {
-                let fileMessageModel = FileMessageModel(messageModel: baseMessageModel, fileName: "测试文件的的.txt", fileSize: "30M", fileFolderColor: UIColor.redColor())
+                let fileMessageModel = FileMessageModel(messageModel: baseMessageModel, fileName: "iPad Design.psd", fileSize: "30M", fileFolderColor: UIColor.redColor())
                 source.append(fileMessageModel)
             }
         }
@@ -226,14 +226,19 @@ class ViewController: MessageViewController {
             "你真的很好嘛?"
         ]
 
+        
+        
         let dataSource = FakeDataSource()
         var items = self.messageDataSource?.messageItems
-        let messageModel = MessageModel(uid: "dsfsdf", senderId: "dsfsdf", type: "text-message", isIncoming: true, date: NSDate(), status: .Success)
+        let messageModel = MessageModel(uid: "dsfsdf\(Int(arc4random() % 300))", senderId: "dsfsdf", type: "text-message", isIncoming: true, date: NSDate(), status: .Success)
         let textMessageModel = TextMessageModel(messageModel: messageModel, text: "dsfsdfsdfsdfsdf\(a[randomNumber])")
-        items?.append(textMessageModel)
-        dataSource.messageItems = items!
-        dataSource.delegate = self
-        self.messageDataSource = dataSource
+        
+        sendNewMessage(textMessageModel)
+        
+//        items?.append(textMessageModel)
+//        dataSource.messageItems = items!
+//        dataSource.delegate = self
+//        self.messageDataSource = dataSource
     }
 
 }

MessageKit/MessageViewController.swift

@@ -2,7 +2,7 @@
 //  MessageKitTests.swift
 //  MessageKitTests
 //
-//  Created by ChenHao on 16/3/8.
+//  Created by ChenHao on 16/3/9.
 //  Copyright © 2016年 HarriesChen. All rights reserved.
 //