Merge branch 'dev' of https://github.com/jpush/aurora-imui into dev

veerjainATgmail · Aug 28, 2018 · 81f7049 · 81f7049
2 parents ed6d73e + 75760e8
commit 81f7049
Show file tree

Hide file tree

Showing 30 changed files with 1,540 additions and 859 deletions.
diff --git a/ReactNative/ios/RCTAuroraIMUI.xcodeproj/project.pbxproj b/ReactNative/ios/RCTAuroraIMUI.xcodeproj/project.pbxproj
diff --git a/ReactNative/ios/RCTAuroraIMUI/MyMessageModel.swift b/ReactNative/ios/RCTAuroraIMUI/MyMessageModel.swift
@@ -32,6 +32,7 @@ open class RCTMessageModel: IMUIMessageModel {
   static let kMsgKeyText = "text"
   static let kMsgKeyisOutgoing = "isOutgoing"
   static let kMsgKeyMediaFilePath = "mediaPath"
+  static let kMsgKeyImageUrl = "imageUrl"
   static let kMsgKeyDuration = "duration"
   static let kMsgKeyContentSize = "contentSize"
   static let kMsgKeyContent = "content"
@@ -47,12 +48,17 @@ open class RCTMessageModel: IMUIMessageModel {
   open var myTextMessage: String = ""
 
   var mediaPath: String = ""
+  var imageUrl: String = ""
   var extras: NSDictionary?
 
   override open func mediaFilePath() -> String {
     return mediaPath
   }
 
+  override open func webImageUrl() -> String {
+    return imageUrl
+  }
+
   @objc static open var outgoingBubbleImage: UIImage = {
     var bubbleImg = UIImage.imuiImage(with: "outGoing_bubble")
     bubbleImg = bubbleImg?.resizableImage(withCapInsets: UIEdgeInsetsMake(24, 10, 9, 15), resizingMode: .tile)
@@ -73,11 +79,12 @@ open class RCTMessageModel: IMUIMessageModel {
     }
   }
 
-  @objc public init(msgId: String, messageStatus: IMUIMessageStatus, fromUser: RCTUser, isOutGoing: Bool, time: String, type: String, text: String, mediaPath: String, layout: IMUIMessageCellLayoutProtocol, duration: CGFloat, extras: NSDictionary?) {
+  @objc public init(msgId: String, messageStatus: IMUIMessageStatus, fromUser: RCTUser, isOutGoing: Bool, time: String, type: String, text: String, mediaPath: String, imageUrl: String, layout: IMUIMessageCellLayoutProtocol, duration: CGFloat, extras: NSDictionary?) {
 
     self.myTextMessage = text
     self.mediaPath = mediaPath
     self.extras = extras
+    self.imageUrl = imageUrl
     super.init(msgId: msgId, messageStatus: messageStatus, fromUser: fromUser, isOutGoing: isOutGoing, time: time, type: type, cellLayout: layout, duration: duration)
   }
 
@@ -109,8 +116,13 @@ open class RCTMessageModel: IMUIMessageModel {
     }
 
     var mediaPath = messageDic.object(forKey: RCTMessageModel.kMsgKeyMediaFilePath) as? String
+    var imgUrl = ""
     if let _ = mediaPath {
-
+      if FileManager.default.fileExists(atPath: mediaPath!) {
+      } else {
+        imgUrl = mediaPath!
+        mediaPath = ""
+      }
     } else {
       mediaPath = ""
     }
@@ -145,6 +157,8 @@ open class RCTMessageModel: IMUIMessageModel {
         var imgSize = CGSize(width: 120, height: 160)
         if let img = UIImage(contentsOfFile: mediaPath!) {
           imgSize = RCTMessageModel.converImageSize(with: CGSize(width: img.size.width, height: img.size.height))
+        } else {
+          imgSize = CGSize(width: 120, height: 160)
         }
 
         messageLayout = MyMessageCellLayout(isOutGoingMessage: isOutgoing ?? true,
@@ -220,7 +234,7 @@ open class RCTMessageModel: IMUIMessageModel {
 
     }
 
-    self.init(msgId: msgId, messageStatus: msgStatus, fromUser: user, isOutGoing: isOutgoing ?? true, time: timeString!, type: msgType!, text: text!, mediaPath: mediaPath!, layout:  messageLayout!,duration: durationTime, extras: extras)
+    self.init(msgId: msgId, messageStatus: msgStatus, fromUser: user, isOutGoing: isOutgoing ?? true, time: timeString!, type: msgType!, text: text!, mediaPath: mediaPath!,imageUrl: imgUrl, layout:  messageLayout!,duration: durationTime, extras: extras)
 
   }
 

diff --git a/ReactNative/ios/RCTAuroraIMUI/MyUser.swift b/ReactNative/ios/RCTAuroraIMUI/MyUser.swift
@@ -13,7 +13,7 @@ open class RCTUser: NSObject, IMUIUserProtocol {
   open var rUserId: String?
   open var rDisplayName: String?
   open var rAvatarFilePath: String?
-
+  open var rAvatarUrl: String?
   public override init() {
     super.init()
   }
@@ -23,6 +23,13 @@ open class RCTUser: NSObject, IMUIUserProtocol {
     self.rUserId = userDic.object(forKey: "userId") as? String
     self.rDisplayName = userDic.object(forKey: "displayName") as? String
     self.rAvatarFilePath = userDic.object(forKey: "avatarPath") as? String
+    if FileManager.default.fileExists(atPath: self.rAvatarFilePath ?? "") {
+
+    } else {
+      self.rAvatarUrl = self.rAvatarFilePath
+      self.rAvatarFilePath = ""
+    }
+
   }
 
   public func userId() -> String {
@@ -50,4 +57,8 @@ open class RCTUser: NSObject, IMUIUserProtocol {
     }
     return UIImage()
   }
+
+  public func avatarUrlString() -> String? {
+    return self.rAvatarUrl
+  }
 }
diff --git a/ReactNative/ios/RCTAuroraIMUI/RCTMessageListView.h b/ReactNative/ios/RCTAuroraIMUI/RCTMessageListView.h
@@ -31,6 +31,9 @@
 @property (nonatomic, copy) RCTBubblingEventBlock onPullToRefresh;
 
 // custom layout
+//maxBubbleWidth
+@property(assign, nonatomic) CGFloat maxBubbleWidth;
+
 @property(copy, nonatomic) NSString *messageListBackgroundColor;
 
 @property(strong, nonatomic) NSDictionary *sendBubble;

diff --git a/ReactNative/ios/RCTAuroraIMUI/RCTMessageListViewManager.m b/ReactNative/ios/RCTAuroraIMUI/RCTMessageListViewManager.m
@@ -97,6 +97,12 @@ - (UIView *)view
 
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(maxBubbleWidth, NSNumber, RCTMessageListView) {
+  NSNumber *widthPercent = [RCTConvert NSNumber: json];
+
+  IMUIMessageCellLayout.bubbleMaxWidth = UIScreen.mainScreen.bounds.size.width * widthPercent.floatValue;
+}
+
 RCT_CUSTOM_VIEW_PROPERTY(sendBubbleTextColor, NSString, RCTMessageListView) {
   NSString *colorString = [RCTConvert NSString: json];
   UIColor *color = [UIColor hexStringToUIColorWithHex:colorString];

diff --git a/ReactNative/messagelist.ios.js b/ReactNative/messagelist.ios.js
@@ -117,7 +117,7 @@ MessageList.propTypes = {
   displayNameTextSize: PropTypes.number,
   displayNameTextColor: PropTypes.string,
   displayNamePadding: PropTypes.object,
-
+  maxBubbleWidth: PropTypes.number,
   eventTextLineHeight: PropTypes.number, //TODO:
   messageTextLineHeight: PropTypes.number, //TODO:
   ...ViewPropTypes