add custom message

Author: guangyao

ios/RCTAuroraIMUI.xcodeproj/project.pbxproj

@@ -142,6 +142,7 @@
 		4E9CE01C1F9DDB1E005FC8A7 /* IMUICardMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9CE01B1F9DDB1E005FC8A7 /* IMUICardMessageCell.swift */; };
 		4EC4F96D1F46F0B1000C5CA6 /* MenuPopOverView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EC4F96B1F46F0B1000C5CA6 /* MenuPopOverView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4EC4F96E1F46F0B1000C5CA6 /* MenuPopOverView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EC4F96C1F46F0B1000C5CA6 /* MenuPopOverView.m */; };
+		4EDCA75C2089809A00B6DB55 /* IMUICustomMessageContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EDCA75B2089809A00B6DB55 /* IMUICustomMessageContentCell.swift */; };
 		623EA9A21EE55D0800EC43AE /* RCTAuroraIMUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 623EA9991EE55D0800EC43AE /* RCTAuroraIMUI.framework */; };
 		623EA9A71EE55D0800EC43AE /* RCTAuroraIMUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 623EA9A61EE55D0800EC43AE /* RCTAuroraIMUITests.m */; };
 		623EA9A91EE55D0800EC43AE /* RCTAuroraIMUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 623EA99B1EE55D0800EC43AE /* RCTAuroraIMUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -325,6 +326,7 @@
 		4E9CE01B1F9DDB1E005FC8A7 /* IMUICardMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IMUICardMessageCell.swift; sourceTree = "<group>"; };
 		4EC4F96B1F46F0B1000C5CA6 /* MenuPopOverView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuPopOverView.h; sourceTree = "<group>"; };
 		4EC4F96C1F46F0B1000C5CA6 /* MenuPopOverView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuPopOverView.m; sourceTree = "<group>"; };
+		4EDCA75B2089809A00B6DB55 /* IMUICustomMessageContentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IMUICustomMessageContentCell.swift; sourceTree = "<group>"; };
 		6239E6641EDDB1F700B9AC9C /* libAuroraIMUI.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAuroraIMUI.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		623EA9701EE55CB200EC43AE /* imuiDemo-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "imuiDemo-Bridging-Header.h"; sourceTree = "<group>"; };
 		623EA9721EE55CB200EC43AE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -676,6 +678,7 @@
 				4E34C3381F3D45CA00AF4B73 /* IMUITransferMessageCell.swift */,
 				4E34C33C1F3DA73900AF4B73 /* IMUIRedPacketOpenMessageCell.swift */,
 				4E31CB2C1F5E8ED6007C3096 /* IMUIUnKnownMessageCell.swift */,
+				4EDCA75B2089809A00B6DB55 /* IMUICustomMessageContentCell.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -975,6 +978,7 @@
 				4E34C33D1F3DA73900AF4B73 /* IMUIRedPacketOpenMessageCell.swift in Sources */,
 				4E77A3AD1F30840000098CAF /* UIViewExtension.swift in Sources */,
 				624B82911EE5710E006C3C03 /* MyUser.swift in Sources */,
+				4EDCA75C2089809A00B6DB55 /* IMUICustomMessageContentCell.swift in Sources */,
 				4E77A3BD1F30840000098CAF /* IMUIMessageStatusViewProtocal.swift in Sources */,
 				4E31CB2D1F5E8ED6007C3096 /* IMUIUnKnownMessageCell.swift in Sources */,
 				4E5274D21F3C5CE2005FB9B9 /* IMUIRedPacketMessageCell.swift in Sources */,

ios/RCTAuroraIMUI.xcodeproj/xcuserdata/dowin.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>AuroraIMUI.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>6</integer>
 		</dict>
 		<key>RCTAuroraIMUI.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>7</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Models/IMUIMessageModel.swift

@@ -195,15 +195,28 @@ open class IMUIMessageModel: NSObject, IMUIMessageModelProtocol {
         bubbleContentSize = CGSize(width: UIScreen.main.bounds.width, height: 40)
         isShowAvatar = false
         break
-        
+    case .custom:
+        var tmpWidth:Float = Float(screenW * 0.4);
+        var tmpHeight:Float = Float(screenW * 0.4);
+        let strWidth = self.customDict.object(forKey: "Width") as! NSString
+        let strHeight = self.customDict.object(forKey: "Height") as! NSString
+        if strWidth.floatValue > 0  {
+            tmpWidth = strWidth.floatValue
+        }
+        if strHeight.floatValue > 0  {
+            tmpHeight = strHeight.floatValue
+        }
+        bubbleContentSize = CGSize(width:  CGFloat(tmpWidth), height: CGFloat(tmpHeight))
+        break
     default:
+         bubbleContentSize = CGSize(width:  CGFloat(200), height: CGFloat(130))
       break
     }
     return bubbleContentSize
   }
     func heightWithFont(font : UIFont, fixedWidth : CGFloat, text : String) -> CGSize {
 
-        guard text.characters.count > 0 && fixedWidth > 0 else {
+        guard text.count > 0 && fixedWidth > 0 else {
 
             return CGSize.zero
         }

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUICustomMessageContentCell.swift

@@ -0,0 +1,43 @@
+//
+//  IMUICustomMessageContentCell.swift
+//  RCTAuroraIMUI
+//
+//  Created by Dowin on 2018/4/20.
+//  Copyright © 2018年 HXHG. All rights reserved.
+//
+
+import UIKit
+import WebKit
+
+class IMUICustomMessageContentCell: IMUIBaseMessageCell {
+    
+    var customView : WKWebView?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        let jsStr = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"
+        let script = WKUserScript(source: jsStr, injectionTime: .atDocumentEnd, forMainFrameOnly: true)
+        let contentController = WKUserContentController()
+        contentController.addUserScript(script)
+        
+        let config = WKWebViewConfiguration()
+        config.userContentController = contentController
+        self.customView = WKWebView(frame: CGRect.zero, configuration: config)
+        self.bubbleView.addSubview(self.customView!)
+        self.customView?.isUserInteractionEnabled = false
+    }
+    
+    required public init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func presentCell(with message: IMUIMessageModelProtocol, viewCache: IMUIReuseViewCache , delegate: IMUIMessageMessageCollectionViewDelegate?) {
+        super.presentCell(with: message, viewCache: viewCache, delegate: delegate)
+        customView!.frame = bubbleView.bounds
+        let tmpDict = message.customDict
+        let strContent = tmpDict.object(forKey: "content") as! String
+        print("dongci:\(strContent)")
+        customView!.loadHTMLString(strContent, baseURL: Bundle.main.bundleURL)
+    }
+}
+

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIMessageCollectionView.swift

@@ -86,6 +86,7 @@ open class IMUIMessageCollectionView: UIView {
     self.messageCollectionView.register(IMUITransferMessageCell.self, forCellWithReuseIdentifier: IMUITransferMessageCell.self.description())
     self.messageCollectionView.register(IMUIRedPacketOpenMessageCell.self, forCellWithReuseIdentifier: IMUIRedPacketOpenMessageCell.self.description())
     self.messageCollectionView.register(IMUIUnKnownMessageCell.self, forCellWithReuseIdentifier: IMUIUnKnownMessageCell.self.description())
+    self.messageCollectionView.register(IMUICustomMessageContentCell.self, forCellWithReuseIdentifier: IMUICustomMessageContentCell.self.description())
     self.messageCollectionView.register(IMUIBaseMessageHeadCell.self, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: "headView")
     self.messageCollectionView.register(IMUICardMessageCell.self, forCellWithReuseIdentifier: IMUICardMessageCell.self.description())
 
@@ -257,6 +258,9 @@ extension IMUIMessageCollectionView: UICollectionViewDelegate, UICollectionViewD
     case .unknown:
         cellIdentify = IMUIUnKnownMessageCell.self.description()
         break
+    case .custom:
+        cellIdentify = IMUICustomMessageContentCell.self.description()
+        break
 
     default:
       break

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUITransferMessageCell.swift

@@ -48,7 +48,7 @@ class IMUITransferMessageCell: IMUIBaseMessageCell {
 
         let tmpDict = message.customDict
         let strContent = tmpDict.object(forKey: "comments") as! String
-        if strContent.characters.count > 0 {
+        if strContent.count > 0 {
             contentLable.text = strContent
         }else{
             contentLable.text = "飞马转账"
@@ -76,8 +76,7 @@ class IMUITransferMessageCell: IMUIBaseMessageCell {
     }
 
     func heightWithFont(font : UIFont, fixedWidth : CGFloat, text : String) -> CGSize {
-        
-        guard text.characters.count > 0 && fixedWidth > 0 else {
+        guard text.count > 0 && fixedWidth > 0 else {
 
             return CGSize.zero
         }

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIVideoMessageCell.swift

@@ -78,7 +78,5 @@ class IMUIVideoMessageCell: IMUIBaseMessageCell {
         }
       }
     }
-    
   }
-  
 }

ios/RCTAuroraIMUI/MyMessageModel.swift

@@ -34,6 +34,7 @@ open class RCTMessageModel: IMUIMessageModel {
     static let kMsgTypeRedpacketOpen = "redpacketOpen"
     static let kMsgTypeCard = "card"
     static let kMsgTypeUnKnow = "unknown"
+    static let kMsgTypeCustom = "custom"
 
 
   static let kMsgKeyMsgId = "msgId"
@@ -233,6 +234,9 @@ open class RCTMessageModel: IMUIMessageModel {
       }else if typeString == RCTMessageModel.kMsgTypeCard{
         msgType = .card
         customDict = messageDic.object(forKey: RCTMessageModel.kMsgKeyExtend) as! NSMutableDictionary
+      }else if typeString == RCTMessageModel.kMsgTypeCustom{
+        msgType = .custom
+        customDict = messageDic.object(forKey: RCTMessageModel.kMsgKeyExtend) as! NSMutableDictionary
       }else{
             msgType = .unknown
         }
@@ -371,6 +375,10 @@ open class RCTMessageModel: IMUIMessageModel {
       case .unknown:
         messageDic.setValue(RCTMessageModel.kMsgTypeUnKnow, forKey: RCTMessageModel.kMsgKeyMsgType)
         break
+      case .custom:
+        messageDic.setValue(RCTMessageModel.kMsgTypeCustom, forKey: RCTMessageModel.kMsgKeyMsgType)
+        messageDic.setValue(self.customDict, forKey: RCTMessageModel.kMsgKeyExtend)
+        break
 
       default:
         break