Merge pull request #381 from zsw666/master

v9.6.5

NEChatUIKit/NEChatUIKit.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = 'NEChatUIKit'
-  s.version      = '9.6.3'
+  s.version      = '9.6.5'
   s.summary      = 'Chat Module of IM.'
 
   # This description is used to generate tags and improve search results.
@@ -32,7 +32,7 @@ TODO: Add long description of the pod here.
   s.author           = 'yunxin engineering department'
   s.source           = { :git => 'ssh://[email protected]:22222/yunxin-app/xkit-ios.git', :tag => s.version.to_s }
 
-  s.ios.deployment_target = '10.0'
+  s.ios.deployment_target = '11.0'
   s.swift_version = '5.0'
 
   s.source_files = 'NEChatUIKit/Classes/**/*'

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

@@ -94,8 +94,8 @@
 "withdrew_message" = "withdrew this message";
 "message_has_be_withdrawn" = "message recalled";
 "message_reedit" = "reedit";
-"message_revoke_confim" = "Wether to recall this message";
-"message_delete_comfirm"="Wether to delete this message";
+"message_revoke_confirm" = "Wether to recall this message";
+"message_delete_confirm"="Wether to delete this message";
 
 
 //MARK: toast
@@ -139,7 +139,7 @@
 "search_result_empty"="Not found";
 "no_map_plugin"="Map module not integrated";
 "location_not_auth"="The geographic location is not authorized. Please open it in the settings";
-"fileSize_over_limit"="Oops！File size limit over XXXM.";
+"fileSize_over_limit"="Oops！File size limit over %@M.";
 
 "message_recalled"="message recalled";
 

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

@@ -24,7 +24,7 @@
 "downloading"="正在下载中...";
 "read"="已读(0）";
 "unread"="未读(0）";
-"network_unavailable"="当前网络不可用，请检查你当网络设置。";
+"network_unavailable"="当前网络不可用，请检查你的网络设置";
 
 //MARK: tips
 //MARK: team
@@ -91,8 +91,8 @@
 "withdrew_message" = "撤回了一条消息";
 "message_has_be_withdrawn" = "此消息已撤回";
 "message_reedit" = "重新编辑";
-"message_revoke_confim" = "确认要撤回该消息吗？";
-"message_delete_comfirm"="确认要删除该消息吗？";
+"message_revoke_confirm" = "确认要撤回该消息吗？";
+"message_delete_confirm"="确认要删除该消息吗？";
 
 
 //MARK: toast
@@ -136,7 +136,7 @@
 "search_result_empty"="未找到你要搜的地址";
 "no_map_plugin"="未集成地图模块";
 "location_not_auth"="地理位置未授权，请去设置中开启";
-"fileSize_over_limit"="当前文件大小超出XXXM发送限制，请重新选择";
+"fileSize_over_limit"="当前文件大小超出%@M发送限制，请重新选择";
 
 "message_recalled"="此消息已撤回";
 

NEChatUIKit/NEChatUIKit/Classes/Base/BaseViewController/ChatBaseViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 @objcMembers
 open class ChatBaseViewController: UIViewController, UIGestureRecognizerDelegate {
   var topConstant: CGFloat = 0
-  public let customNavigationView = NENavigationView()
+  public let navigationView = NENavigationView()
 
   override open var title: String? {
     get {
@@ -19,16 +19,16 @@ open class ChatBaseViewController: UIViewController, UIGestureRecognizerDelegate
 
     set {
       super.title = newValue
-      customNavigationView.navTitle.text = newValue
+      navigationView.navTitle.text = newValue
     }
   }
 
   override open func viewDidLoad() {
     super.viewDidLoad()
     navigationController?.interactivePopGestureRecognizer?.delegate = self
-    view.backgroundColor = NEKitChatConfig.shared.ui.chatViewBackground ?? .white
+    view.backgroundColor = NEKitChatConfig.shared.ui.messageProperties.chatViewBackground ?? .white
 
-    if !NEKitChatConfig.shared.ui.showTitleBar {
+    if !NEKitChatConfig.shared.ui.messageProperties.showTitleBar {
       navigationController?.isNavigationBarHidden = true
       return
     }
@@ -40,15 +40,15 @@ open class ChatBaseViewController: UIViewController, UIGestureRecognizerDelegate
     } else {
       navigationController?.isNavigationBarHidden = true
       topConstant = NEConstant.navigationAndStatusHeight
-      customNavigationView.translatesAutoresizingMaskIntoConstraints = false
-      customNavigationView.addBackButtonTarget(target: self, selector: #selector(backEvent))
-      customNavigationView.addMoreButtonTarget(target: self, selector: #selector(toSetting))
-      view.addSubview(customNavigationView)
+      navigationView.translatesAutoresizingMaskIntoConstraints = false
+      navigationView.addBackButtonTarget(target: self, selector: #selector(backEvent))
+      navigationView.addMoreButtonTarget(target: self, selector: #selector(toSetting))
+      view.addSubview(navigationView)
       NSLayoutConstraint.activate([
-        customNavigationView.leftAnchor.constraint(equalTo: view.leftAnchor),
-        customNavigationView.rightAnchor.constraint(equalTo: view.rightAnchor),
-        customNavigationView.topAnchor.constraint(equalTo: view.topAnchor),
-        customNavigationView.heightAnchor.constraint(equalToConstant: topConstant),
+        navigationView.leftAnchor.constraint(equalTo: view.leftAnchor),
+        navigationView.rightAnchor.constraint(equalTo: view.rightAnchor),
+        navigationView.topAnchor.constraint(equalTo: view.topAnchor),
+        navigationView.heightAnchor.constraint(equalToConstant: topConstant),
       ])
     }
   }