Merge pull request #385 from zsw666/master

v10.1.0

NEChatUIKit/NEChatUIKit.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = 'NEChatUIKit'
-  s.version      = '9.7.0'
+  s.version      = '10.1.0'
   s.summary      = 'Chat Module of IM.'
 
   # This description is used to generate tags and improve search results.

NEChatUIKit/NEChatUIKit/Assets/FunChatUIKit.xcassets/Chat/fun_top_message_Image.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/Chat/top_close.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/Map/chat_map_default.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "location_default 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "location_default.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/Map/map_placeholder_image.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NEBaseChatUIKit.xcassets/operation/op_collect.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/NormalChatUIKit.xcassets/Chat/top_message_Image.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NEChatUIKit/NEChatUIKit/Assets/en.lproj/Localizable.strings

@@ -17,7 +17,6 @@
 "record_too_short"="Time is too short";
 "no_microphone_permission"="no micro permission";
 "choose"="select";
-"take_photo"="camera";
 "select_from_album"="album";
 "select_from_icloud"="icloud";
 "editing"="typing";
@@ -51,9 +50,11 @@
 "team_join_mode" = "join mode";
 "team_be_invited_mode" = "invite mode";
 "team_be_invited_permission" = "Invite Permission";
-"team_be_invited_author" = "是否需要被邀请者同意权限";
-"team_update_info_permission" = "update info permission";
+"team_be_invited_author" = "BeInvite Permission";
+"team_update_info_permission" = "Update info permission";
 "team_update_client_custom"="Update Permission";
+"team_at_permission"="@All Permission update to ";
+"team_top_permission"="Top message permission update to ";
 
 "team_custom_info" = "custom info";
 "not_mute" = "unmute";
@@ -75,20 +76,27 @@
 "pin_text_P2P"="pinned this message";
 "pin_text_team"="pinned this message";
 
+"top_message"="top message";
+"untop_message"="untop message";
+
 "chat_setting"="chat setting";
 "session_set_top"="sticky to top";
 "message_remind"="open notification";
 
 "open_soon"="Not open";
+"no_permission_tip"="No permission";
 
 //MARK: operation
 "operation_copy"="copy";
 "operation_replay"="reply";
 "operation_forward"="forward";
 "operation_pin"="pin";
 "operation_cancel_pin"="unpin";
+"operation_delete_collection"="delete collection";
 "operation_select"="multi-select";
-"operation_collection"="favorite";
+"operation_collection"="collection";
+"operation_top"="top";
+"operation_untop"="untop";
 "operation_delete"="delete";
 "operation_recall"="recall";
 "withdrew_message" = "withdrew this message";
@@ -98,7 +106,6 @@
 
 
 //MARK: toast
-"copy_success"="Copy successfully";
 "collection_success"="Favorite";
 "no_permession"="No Permission";
 "msg_reply"="reply";
@@ -123,6 +130,9 @@
 "send_to"="send to";
 "send"="send";
 "confirm"="yes";
+"session_record"="session record";
+
+"collection_message"=" collection message";
 
 
 "mdhm"="MM.dd HH:mm";
@@ -163,12 +173,14 @@
 "pin_jump_detail"="jump to details";
 "cancel_pin_success"="Unpin";
 "no_pin_message"="No pin message";
+"no_collection_message"="No collection message";
 
 "you_were_mentioned"="[You were mentioned]";
 // MARK: error toast
 "failed_operation"="Failed Operation";
 "team_not_exist"="team not exist";
 "unpin_failed"="Unpin failed";
+"pin_limit_exceeded"="The number of pin has reached the upper limit";
 
 "fun_hold_to_talk"="Hold to talk";
 
@@ -194,10 +206,16 @@
 "multiForward_open_failed"="Failed to obtain information";
 "file_check_failed"="File verification failed";
 "per_item_forward_limit"="Forward one by one to limit %d messages";
+"selete_messages_limit"="Delete limits %d messages";
 "multiForward_forward_limit"="Combined forwarding limits %d messages";
 "exception_description"="Exception description";
 
 "multiple_line_placleholder"="Please enter title";
 "null_message_not_support"="Empty messages are not allowed to be sent";
 
 "black_list_tip"="Opposite has blocked you and the message cannot be sent.";
+"disable_stranger_call"="Cannot make audio or video calls to someone who is not in your friends list.";
+
+"chat_collection_p2p_tip"="From Chat with %@";
+
+"chat_collection_team_tip"="From %@ ";

NEChatUIKit/NEChatUIKit/Assets/zh-Hans.lproj/Localizable.strings

@@ -17,7 +17,6 @@
 "record_too_short"="录音时间太短";
 "no_microphone_permission"="没有麦克风权限";
 "choose"="请选择";
-"take_photo"="拍照";
 "select_from_album"="从相册选择";
 "select_from_icloud"="从iCloud选择";
 "editing"="对方正在输入中...";
@@ -54,6 +53,8 @@
 "team_be_invited_author" = "是否需要被邀请者同意权限";
 "team_update_info_permission" = "群资料修改权限";
 "team_update_client_custom"="更新客户端自定义字段的权限";
+"team_at_permission"="@所有人权限更新为";
+"team_top_permission"="置顶消息权限更新为";
 
 "team_custom_info" = "自定义扩展字段";
 "not_mute" = "解除禁言";
@@ -73,19 +74,25 @@
 "team_all_no_mute"="群禁言已关闭";
 "pin_text_P2P"="标记了这条信息";
 "pin_text_team"="标记了这条信息";
+"top_message"="置顶了一条消息";
+"untop_message"="移除了置顶消息";
 "chat_setting"="聊天设置";
 "session_set_top"="聊天置顶";
 "message_remind"="开启消息提醒";
 "open_soon"="暂未开放";
+"no_permission_tip"="暂无操作权限";
 
 //MARK: operation
 "operation_copy"="复制";
 "operation_replay"="回复";
 "operation_forward"="转发";
 "operation_pin"="标记";
 "operation_cancel_pin"="取消标记";
+"operation_delete_collection"="删除收藏";
 "operation_select"="多选";
 "operation_collection"="收藏";
+"operation_top"="置顶";
+"operation_untop"="移除置顶";
 "operation_delete"="删除";
 "operation_recall"="撤回";
 "withdrew_message" = "撤回了一条消息";
@@ -95,7 +102,6 @@
 
 
 //MARK: toast
-"copy_success"="复制成功";
 "collection_success"="已收藏";
 "no_permession"="暂无权限";
 "msg_reply"="回复";
@@ -120,6 +126,9 @@
 "send_to"="发送给";
 "send"="发送";
 "confirm"="确定";
+"session_record"="的会话记录";
+
+"collection_message"="的收藏消息";
 
 
 "mdhm"="MM月dd日 HH:mm";
@@ -161,12 +170,14 @@
 "pin_jump_detail"="跳转查看";
 "cancel_pin_success"="已取消标记";
 "no_pin_message"="暂无标记消息";
+"no_collection_message"="暂无收藏消息";
 
 "you_were_mentioned"="[有人@我]";
 // MARK: error toast
 "failed_operation"="操作失败";
 "team_not_exist"="群组不存在";
 "unpin_failed"="取消标记失败";
+"pin_limit_exceeded"="已超出 pin 数量上限";
 
 "fun_hold_to_talk"="按住 说话";
 
@@ -192,10 +203,16 @@
 "multiForward_open_failed"="信息获取失败";
 "file_check_failed"="文件校验失败";
 "per_item_forward_limit"="逐条转发限制%d条消息";
+"selete_messages_limit"="批量删除限制%d条消息";
 "multiForward_forward_limit"="合并转发限制%d条消息";
 "exception_description"="异常说明";
 
 "multiple_line_placleholder"="请输入标题";
 "null_message_not_support"="不支持发送空消息";
 
 "black_list_tip"="对方已将您拉黑，消息无法发送";
+"disable_stranger_call"="非好友暂不支持音视频通话";
+
+"chat_collection_p2p_tip"="来自于 与%@的会话";
+
+"chat_collection_team_tip"="来自于 %@";

NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatCenterTextCell.swift

@@ -36,6 +36,6 @@ open class ChatCenterTextCell: ChatCornerCell {
   }
 
   public required init?(coder: NSCoder) {
-    fatalError("init(coder:) has not been implemented")
+    super.init(coder: coder)
   }
 }

NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatCornerCell.swift

@@ -4,6 +4,7 @@
 // found in the LICENSE file.
 
 import NECommonUIKit
+
 // this cell has rounding corner style
 import UIKit
 

NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatHeaderView.swift

@@ -15,14 +15,6 @@ open class ChatHeaderView: UIView {
     return label
   }()
 
-  /*
-   // Only override draw() if you perform custom drawing.
-   // An empty implementation adversely affects performance during animation.
-   override func draw(_ rect: CGRect) {
-       // Drawing code
-   }
-   */
-
   override init(frame: CGRect) {
     super.init(frame: frame)
     setupUI()