Merge pull request #372 from zsw666/master

950 release

NEChatUIKit/NEChatUIKit.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = 'NEChatUIKit'
-  spec.version      = '9.2.10'
+  spec.version      = '9.5.0'
   spec.summary      = 'Chat Module of IM.'
 
   # This description is used to generate tags and improve search results.
@@ -49,12 +49,13 @@ TODO: Add long description of the pod here.
   spec.resource = 'NEChatUIKit/Assets/**/*'
   spec.dependency 'NEChatKit'
   spec.dependency 'NECommonUIKit'
-  spec.dependency 'RSKPlaceholderTextView'
   spec.dependency 'MJRefresh'
   spec.dependency 'NIMSDK_LITE'
+  spec.dependency 'YXAlog'
+  spec.dependency 'UITextView+Placeholder'
+  spec.dependency 'SDWebImageWebPCoder'
+  spec.dependency 'SDWebImageSVGKitPlugin'
+
 
-#  spec.dependency 'AMap2DMap'
-#  spec.dependency 'AMapSearch'
-#  spec.dependency 'AMapLocation'
 
 end

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

@@ -21,6 +21,7 @@
 "select_from_album"="album";
 "select_from_icloud"="icloud";
 "editing"="typing";
+"downloading"="downloading...";
 "read"="read";
 "unread"="unread";
 "network_unavailable"="No internet, Please check your setting";
@@ -33,32 +34,36 @@
 "enter"="enter";
 "unknown_system_message"="Unknown message";
 "You"="you";
-"discussion_group"="temp group";
+"discussion_group"="group";
 "group"="group";
+"group_chat"="group chat";
 "dissolve"="dissolved";
 "kick"="将 ";
 "out"="remove";
-"has_updated" = "updated";
+"has_updated" = "update";
+"to" = "to ";
+"only_team_owner" = "Only the group owner";
+"everyone" = "Everyone";
 
-"team_name" = "name";
-"team_intro" = "Info";
+"team_name" = "Group Name";
+"team_intro" = "Group Introduction";
 "team_anouncement" = "Notice";
-"team_avatar" = "Avatar";
+"team_avatar" = "Group Avatar";
 "team_join_mode" = "join mode";
 "team_be_invited_mode" = "invite mode";
-"team_be_invited_permission" = "invite permission";
+"team_be_invited_permission" = "Invite Permission";
 "team_be_invited_author" = "是否需要被邀请者同意权限";
 "team_update_info_permission" = "update info permission";
-"team_update_client_custom"="update custom permission";
+"team_update_client_custom"="Update Permission";
 
 "team_custom_info" = "custom info";
 "not_mute" = "unmute";
 "mute" = "mute";
-"team_has_been_removed" = "This group was removed";
+"team_has_been_removed" = "This group is disbanded";
 "team_has_quit" = "Group chat has exited";
 "join"="joined";
 "pass"="Passed";
-"leave"="leave";
+"leave"="quit";
 "transfer"="Transferred the group leader identity to";
 "added_manager"="add to be Group administrator";
 "removed_manager"="Group administrator identity revoked";
@@ -67,8 +72,8 @@
 "team_all_mute"="Mute all";
 "team_all_no_mute"="Unmute";
 
-"pin_text_P2P"="pinned this message for both";
-"pin_text_team"="pinned this message for both all";
+"pin_text_P2P"="pinned this message";
+"pin_text_team"="pinned this message";
 
 "session_set_top"="sticky to top";
 "message_remind"="open notification";
@@ -146,3 +151,14 @@
 
 "editable_time_expired"="Editable time has expired";
 "message_not_found"="This message is gone";
+
+"unkonw_pin_message"="unkonw message type";
+"pin_jump_detail"="jump to details";
+"cancel_pin_success"="Unpin";
+"no_pin_message"="No pin message";
+
+"you_were_mentioned"="[You were mentioned]";
+// MARK: error toast
+"failed_operation"="Failed Operation";
+"team_not_exist"="team not exist";
+"unpin_failed"="Unpin failed";

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

@@ -22,40 +22,39 @@
 "select_from_album"="从相册选择";
 "select_from_icloud"="从iCloud选择";
 "editing"="正在输入中...";
+"downloading"="正在下载中...";
 "read"="已读(0）";
 "unread"="未读(0）";
 "network_unavailable"="当前网络不可用，请检查你当网络设置。";
 
-
-
-
-
-
-
-
 //MARK: tips
 //MARK: team
 "invite"="邀请 ";
 "humans"="人";
-"enter"="进入了";
+"enter"="加入";
 "unknown_system_message"="未知消息类型";
 "You"="你 ";
-"discussion_group"="讨论组";
+"discussion_group"="群";
 "group"="群";
+"group_chat"="群聊";
 "dissolve"="解散了";
 "kick"="将 ";
 "out"="移除了 ";
 "has_updated" = "更新了";
+"to" = "为 ";
+"only_team_owner" = "仅群主";
+"everyone" = "所有人";
 
-"team_name" = "名字";
+"team_name" = "名称";
 "team_intro" = "介绍";
 "team_anouncement" = "公告";
 "team_avatar" = "头像";
 "team_join_mode" = "加入方式";
+"team_permission" = "群权限";
 "team_be_invited_mode" = "邀请方式";
-"team_be_invited_permission" = "邀请权限";
+"team_be_invited_permission" = "邀请他人权限";
 "team_be_invited_author" = "是否需要被邀请者同意权限";
-"team_update_info_permission" = "更新群信息权限";
+"team_update_info_permission" = "群资料修改权限";
 "team_update_client_custom"="更新客户端自定义字段的权限";
 
 "team_custom_info" = "自定义扩展字段";
@@ -65,16 +64,16 @@
 "team_has_quit" = "已退出群聊";
 "join"="进入了";
 "pass"="通过了";
-"leave"="离开了";
+"leave"="退出了";
 "transfer"="转移了群主身份给";
 "added_manager"="被添加为群管理员";
 "removed_manager"="被撤销了群管理员身份";
 "accept"="接受入群邀请来自";
 "team_mute"="当前群主设置为禁言";
-"team_all_mute"="群全体禁言";
-"team_all_no_mute"="取消群全体禁言";
-"pin_text_P2P"="标记了这条信息，对话内容双方均可见";
-"pin_text_team"="标记了这条信息，所有群成员均可见";
+"team_all_mute"="群禁言已开启";
+"team_all_no_mute"="群禁言已关闭";
+"pin_text_P2P"="标记了这条信息";
+"pin_text_team"="标记了这条信息";
 "session_set_top"="聊天置顶";
 "message_remind"="开启消息提醒";
 "open_soon"="暂未开放";
@@ -101,7 +100,7 @@
 "no_permession"="暂无权限";
 "msg_reply"="回复";
 "msg_image"="图片";
-"msg_audio"="语音";
+"msg_audio"="语音消息";
 "msg_video"="视频";
 "msg_file"="文件";
 "msg_location"="地理位置";
@@ -149,4 +148,15 @@
 "call_busy"="忙线未接听";
 
 "editable_time_expired"="已超过可编辑时间";
-"message_not_found"="该消息已移除";
+"message_not_found"="该消息已撤回或删除";
+
+"unkonw_pin_message"="暂不支持消息类型";
+"pin_jump_detail"="跳转查看";
+"cancel_pin_success"="已取消标记";
+"no_pin_message"="暂无标记消息";
+
+"you_were_mentioned"="[有人@我]";
+// MARK: error toast
+"failed_operation"="操作失败";
+"team_not_exist"="群组不存在";
+"unpin_failed"="取消标记失败";

NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/ChatBaseCell.swift → NEChatUIKit/NEChatUIKit/Classes/Base/BaseView/NEChatBaseCell.swift

@@ -6,17 +6,19 @@
 import UIKit
 
 @objcMembers
-public class ChatBaseCell: UITableViewCell {
-  override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+open class NEChatBaseCell: UITableViewCell {
+  override public init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
     super.init(style: style, reuseIdentifier: reuseIdentifier)
     selectionStyle = .none
   }
 
-  required init?(coder: NSCoder) {
+  public required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
 
   public func uploadProgress(_ progress: Float) {
     fatalError("override in sub class")
   }
+
+  open func setModel(_ model: MessageContentModel) {}
 }