v10.8.6 (#443)

zsw666 · web-flow · commit 53d623216cc2 · 2025-09-11T13:54:50.000+08:00
* v10.8.6

* add custom contact viewController simple code

---------
diff --git a/NEChatUIKit/NEChatUIKit/Classes/Chat/View/Cell/CollectionCell/NEBaseCollectionMessageAudioCell.swift b/NEChatUIKit/NEChatUIKit/Classes/Chat/View/Cell/CollectionCell/NEBaseCollectionMessageAudioCell.swift
@@ -37,7 +37,7 @@ class NEBaseCollectionMessageAudioCell: NEBaseCollectionMessageCell {
   override open func setupCommonUI() {
     super.setupCommonUI()
 
-    let receiveImage = ChatUIConfig.shared.messageProperties.leftBubbleBg ?? UIImage.ne_imageNamed(name: "chat_message_receive")
+    let receiveImage = ChatUIConfig.shared.messageProperties.receiveMessageBgImage ?? UIImage.ne_imageNamed(name: "chat_message_receive")
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImage.image = receiveImage?.resizableImage(withCapInsets: backgroundImageCapInsets)
     } else {
diff --git a/NEChatUIKit/NEChatUIKit/Classes/Chat/View/Cell/NEBaseChatMessageCell.swift b/NEChatUIKit/NEChatUIKit/Classes/Chat/View/Cell/NEBaseChatMessageCell.swift
@@ -123,8 +123,8 @@ open class NEBaseChatMessageCell: NEChatBaseCell {
   }
 
   open func setBubbleImage() {
-    var image = ChatUIConfig.shared.messageProperties.leftBubbleBg ?? UIImage.ne_imageNamed(name: "chat_message_receive")
-    bubbleImageLeft.backgroundColor = ChatUIConfig.shared.messageProperties.receiveMessageBg
+    var image = ChatUIConfig.shared.messageProperties.receiveMessageBgImage ?? UIImage.ne_imageNamed(name: "chat_message_receive")
+    bubbleImageLeft.backgroundColor = ChatUIConfig.shared.messageProperties.receiveMessageBgColor
 
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImageLeft.image = image?.resizableImage(withCapInsets: backgroundImageCapInsets)
@@ -133,8 +133,8 @@ open class NEBaseChatMessageCell: NEChatBaseCell {
       bubbleImageLeft.contentMode = .scaleAspectFill
     }
 
-    image = ChatUIConfig.shared.messageProperties.rightBubbleBg ?? UIImage.ne_imageNamed(name: "chat_message_send")
-    bubbleImageRight.backgroundColor = ChatUIConfig.shared.messageProperties.selfMessageBg
+    image = ChatUIConfig.shared.messageProperties.selfMessageBgImage ?? UIImage.ne_imageNamed(name: "chat_message_send")
+    bubbleImageRight.backgroundColor = ChatUIConfig.shared.messageProperties.selfMessageBgColor
 
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImageRight.image = image?.resizableImage(withCapInsets: backgroundImageCapInsets)
diff --git a/NEChatUIKit/NEChatUIKit/Classes/Chat/View/Cell/PinCell/NEBasePinMessageAudioCell.swift b/NEChatUIKit/NEChatUIKit/Classes/Chat/View/Cell/PinCell/NEBasePinMessageAudioCell.swift
@@ -23,7 +23,7 @@ open class NEBasePinMessageAudioCell: NEBasePinMessageCell {
   override open func setupUI() {
     super.setupUI()
 
-    let image = ChatUIConfig.shared.messageProperties.leftBubbleBg ?? UIImage.ne_imageNamed(name: "chat_message_receive")
+    let image = ChatUIConfig.shared.messageProperties.receiveMessageBgImage ?? UIImage.ne_imageNamed(name: "chat_message_receive")
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImage.image = image?.resizableImage(withCapInsets: backgroundImageCapInsets)
     } else {
diff --git a/NEChatUIKit/NEChatUIKit/Classes/ChatConfig/ChatUIConfig.swift b/NEChatUIKit/NEChatUIKit/Classes/ChatConfig/ChatUIConfig.swift
@@ -125,16 +125,16 @@ public class MessageProperties: NSObject {
   public var inputPlaceholderTextColor: UIColor?
 
   // 自己发送的消息体的背景色
-  public var selfMessageBg: UIColor = .clear
+  public var selfMessageBgColor: UIColor = .clear
 
   // 接收到的消息体的背景色
-  public var receiveMessageBg: UIColor = .clear
+  public var receiveMessageBgColor: UIColor = .clear
 
-  // 右侧聊天背景气泡
-  public var rightBubbleBg: UIImage?
+  // 自己发送的消息体的背景气泡
+  public var selfMessageBgImage: UIImage?
 
-  // 左侧聊天背景气泡
-  public var leftBubbleBg: UIImage?
+  // 接收到的消息体的背景气泡
+  public var receiveMessageBgImage: UIImage?
 
   // 气泡图片拉伸参数（边距偏移）
   public var backgroundImageCapInsets: UIEdgeInsets? = UIEdgeInsets(top: 35, left: 25, bottom: 10, right: 25)
diff --git a/NEChatUIKit/NEChatUIKit/Classes/FunUI/Cell/CollectionCell/FunCollectionMessageAudioCell.swift b/NEChatUIKit/NEChatUIKit/Classes/FunUI/Cell/CollectionCell/FunCollectionMessageAudioCell.swift
@@ -31,7 +31,7 @@ class FunCollectionMessageAudioCell: NEBaseCollectionMessageAudioCell {
   override open func setupCommonUI() {
     super.setupCommonUI()
     setFunStyle()
-    let image = ChatUIConfig.shared.messageProperties.leftBubbleBg ?? UIImage.ne_imageNamed(name: "fun_pin_message_audio_bg")
+    let image = ChatUIConfig.shared.messageProperties.receiveMessageBgImage ?? UIImage.ne_imageNamed(name: "fun_pin_message_audio_bg")
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImage.image = image?.resizableImage(withCapInsets: backgroundImageCapInsets)
     } else {
diff --git a/NEChatUIKit/NEChatUIKit/Classes/FunUI/Cell/FunChatMessageBaseCell.swift b/NEChatUIKit/NEChatUIKit/Classes/FunUI/Cell/FunChatMessageBaseCell.swift
@@ -201,15 +201,15 @@ open class FunChatMessageBaseCell: NEBaseChatMessageCell {
     readView.borderLayer.strokeColor = UIColor.funChatThemeColor.cgColor
     readView.sectorLayer.fillColor = UIColor.funChatThemeColor.cgColor
 
-    var image = ChatUIConfig.shared.messageProperties.leftBubbleBg ?? UIImage.ne_imageNamed(name: "chat_message_receive_fun")
+    var image = ChatUIConfig.shared.messageProperties.receiveMessageBgImage ?? UIImage.ne_imageNamed(name: "chat_message_receive_fun")
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImageLeft.image = image?.resizableImage(withCapInsets: backgroundImageCapInsets)
     } else {
       bubbleImageLeft.image = image
       bubbleImageLeft.contentMode = .scaleAspectFill
     }
 
-    image = ChatUIConfig.shared.messageProperties.rightBubbleBg ?? UIImage.ne_imageNamed(name: "chat_message_send_fun")
+    image = ChatUIConfig.shared.messageProperties.selfMessageBgImage ?? UIImage.ne_imageNamed(name: "chat_message_send_fun")
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImageRight.image = image?.resizableImage(withCapInsets: backgroundImageCapInsets)
     } else {
diff --git a/NEChatUIKit/NEChatUIKit/Classes/FunUI/Cell/PinCell/FunPinMessageAudioCell.swift b/NEChatUIKit/NEChatUIKit/Classes/FunUI/Cell/PinCell/FunPinMessageAudioCell.swift
@@ -13,7 +13,7 @@ open class FunPinMessageAudioCell: NEBasePinMessageAudioCell {
     backRightConstraint?.constant = 0
     backView.layer.cornerRadius = 0
     headerView.layer.cornerRadius = 4.0
-    let image = ChatUIConfig.shared.messageProperties.leftBubbleBg ?? UIImage.ne_imageNamed(name: "fun_pin_message_audio_bg")
+    let image = ChatUIConfig.shared.messageProperties.receiveMessageBgImage ?? UIImage.ne_imageNamed(name: "fun_pin_message_audio_bg")
     if let backgroundImageCapInsets = ChatUIConfig.shared.messageProperties.backgroundImageCapInsets {
       bubbleImage.image = image?.resizableImage(withCapInsets: backgroundImageCapInsets)
     } else {
diff --git a/NECommonUIKit/NECommonUIKit/Assets/en.lproj/Localizable.strings b/NECommonUIKit/NECommonUIKit/Assets/en.lproj/Localizable.strings
@@ -65,3 +65,7 @@
 "detect_mailto_title"="Send message to\“%@\”";
 "detect_mailto_send"="Send via default email account";
 "detect_mailto_copy"="Copy Email";
+
+"request_timed_out"="Request timed out. Please try again.";
+"invalid_URL"="Invalid URL";
+"failed_to_load"="Failed to load. Error code: %d";
diff --git a/NECommonUIKit/NECommonUIKit/Assets/zh-Hans.lproj/Localizable.strings b/NECommonUIKit/NECommonUIKit/Assets/zh-Hans.lproj/Localizable.strings
@@ -66,3 +66,7 @@
 "detect_mailto_title"="向\“%@\”发送邮件";
 "detect_mailto_send"="使用默认邮件账户";
 "detect_mailto_copy"="复制邮箱";
+
+"request_timed_out"="请求超时，请重试";
+"invalid_URL"="无效的网页地址";
+"failed_to_load"="加载失败，错误代码：";
diff --git a/NECommonUIKit/NECommonUIKit/Classes/CommonView/NELinkableLabel.swift b/NECommonUIKit/NECommonUIKit/Classes/CommonView/NELinkableLabel.swift
@@ -1,3 +1,8 @@
+
+// Copyright (c) 2022 NetEase, Inc. All rights reserved.
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
 import UIKit
 
 @objc
diff --git a/NECommonUIKit/NECommonUIKit/Classes/CommonViewController/NEWKWebViewController.swift b/NECommonUIKit/NECommonUIKit/Classes/CommonViewController/NEWKWebViewController.swift
@@ -10,6 +10,13 @@ import WebKit
 public class NEWKWebViewController: NEBaseViewController {
   private var loadUrl: String = ""
 
+  lazy var webview: WKWebView = {
+    let webview = WKWebView()
+    webview.translatesAutoresizingMaskIntoConstraints = false
+    webview.navigationDelegate = self
+    return webview
+  }()
+
   override public func viewDidLoad() {
     super.viewDidLoad()
     setUpSubViews()
@@ -34,8 +41,6 @@ public class NEWKWebViewController: NEBaseViewController {
       return
     }
 
-    let webview = WKWebView()
-    webview.translatesAutoresizingMaskIntoConstraints = false
     let request = URLRequest(url: requestUrl)
     webview.load(request)
     view.addSubview(webview)
@@ -48,3 +53,55 @@ public class NEWKWebViewController: NEBaseViewController {
     ])
   }
 }
+
+extension NEWKWebViewController: WKNavigationDelegate {
+  // 处理页面加载失败
+  public func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+    handleWebViewError(error)
+  }
+
+  // 处理导航失败
+  public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+    handleWebViewError(error)
+  }
+
+  private func handleWebViewError(_ error: Error) {
+    let nsError = error as NSError
+    let errorCode = nsError.code
+
+    // 常见错误类型处理
+    switch errorCode {
+    case NSURLErrorNotConnectedToInternet:
+      showErrorAlert(message: commonLocalizable("network_error"))
+    case NSURLErrorTimedOut:
+      showErrorAlert(message: commonLocalizable("request_timed_out"))
+    case NSURLErrorCannotFindHost, NSURLErrorBadURL:
+      showErrorAlert(message: commonLocalizable("invalid_URL"))
+    default:
+      showErrorAlert(message: String(format: commonLocalizable("failed_to_load"), errorCode))
+    }
+
+    // 加载本地错误页面
+    loadLocalErrorPage()
+  }
+
+  private func showErrorAlert(message: String) {
+    DispatchQueue.main.async { [weak self] in
+      self?.showSingleAlert(message: message) {
+        self?.navigationController?.popViewController(animated: true)
+      }
+    }
+  }
+
+  private func loadLocalErrorPage() {
+    let htmlContent = """
+    <html>
+    <body style="font-family: -apple-system; padding: 20px;">
+        <h2 style="color: #FF3B30;">Page Failed to Load</h2>
+        <p>Please check your internet connection or verify the URL.</p>
+    </body>
+    </html>
+    """
+    webview.loadHTMLString(htmlContent, baseURL: nil)
+  }
+}
diff --git a/NECommonUIKit/NECommonUIKit/Classes/Vender/TabPageViewController/NETabPagingMenuViewController.swift b/NECommonUIKit/NECommonUIKit/Classes/Vender/TabPageViewController/NETabPagingMenuViewController.swift
@@ -5,7 +5,7 @@
 import UIKit
 
 /// this represents the display and behaviour of the cells.
-public protocol NEPagingMenuViewControllerDelegate: AnyObject {
+public protocol NETabPagingMenuViewControllerDelegate: AnyObject {
   /// Tells the delegate when the menu finished to scroll focus view.
   ///
   /// - Parameters:
@@ -38,15 +38,15 @@ public protocol NEPagingMenuViewControllerDelegate: AnyObject {
   func menuViewController(viewController: NETabPagingMenuViewController, willDisplay cell: NEPagingMenuViewCell, forItemAt index: Int)
 }
 
-public extension NEPagingMenuViewControllerDelegate {
+public extension NETabPagingMenuViewControllerDelegate {
   func menuViewController(viewController: NETabPagingMenuViewController, focusViewDidEndTransition focusView: PagingMenuFocusView) {}
 
   func menuViewController(viewController: NETabPagingMenuViewController, willAnimateFocusViewTo index: Int, with coordinator: PagingMenuFocusViewAnimationCoordinator) {}
   func menuViewController(viewController: NETabPagingMenuViewController, willDisplay cell: NEPagingMenuViewCell, forItemAt index: Int) {}
 }
 
 /// The data source provides the paging menu view controller object with the information it needs to construct and modify the menus.
-public protocol NEPagingMenuViewControllerDataSource: AnyObject {
+public protocol NETabPagingMenuViewControllerDataSource: AnyObject {
   /// Tells the data source to return the number of items in a menu view of the menu view controller.
   ///
   /// - Parameter viewController: The menu view controller object requesting this information.
@@ -73,9 +73,9 @@ public protocol NEPagingMenuViewControllerDataSource: AnyObject {
 /// A view controller that presents menu using cells arranged in a single column.
 public class NETabPagingMenuViewController: UIViewController {
   /// The object that acts as the delegate of the menu view controller.
-  public weak var delegate: NEPagingMenuViewControllerDelegate?
+  public weak var delegate: NETabPagingMenuViewControllerDelegate?
   /// The object that acts as the data source of the menu view controller.
-  public weak var dataSource: NEPagingMenuViewControllerDataSource?
+  public weak var dataSource: NETabPagingMenuViewControllerDataSource?
 
   private var fireInvalidateLayout: (() -> Void)?
 
diff --git a/PodConfigs/config_podspec.rb b/PodConfigs/config_podspec.rb
@@ -2,11 +2,11 @@
 
 module YXConfig
   def self.commonuikit_version
-    "9.8.0"
+    "9.8.1"
   end
 
   def self.imuikit_version
-    "10.8.5"
+    "10.8.6"
   end
 
   def self.deployment_target
diff --git a/app.xcodeproj/project.pbxproj b/app.xcodeproj/project.pbxproj
@@ -715,7 +715,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 10.8.5;
+				MARKETING_VERSION = 10.8.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -764,7 +764,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 10.8.5;
+				MARKETING_VERSION = 10.8.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.netease.yunxin.app.im;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/app/Custom/CustomConfig.swift b/app/Custom/CustomConfig.swift
@@ -22,8 +22,8 @@ public class CustomConfig {
     ChatUIConfig.shared.messageProperties.avatarType = .cycle
     ChatUIConfig.shared.messageProperties.avatarCornerRadius = 8.0
     ChatUIConfig.shared.messageProperties.signalBgColor = UIColor.yellow
-    ChatUIConfig.shared.messageProperties.selfMessageBg = UIColor.ne_greenText
-    ChatUIConfig.shared.messageProperties.receiveMessageBg = UIColor.ne_greenText
+    ChatUIConfig.shared.messageProperties.selfMessageBgColor = UIColor.ne_greenText
+    ChatUIConfig.shared.messageProperties.receiveMessageBgColor = UIColor.ne_greenText
     ChatUIConfig.shared.messageProperties.timeTextColor = UIColor.ne_darkText
     ChatUIConfig.shared.messageProperties.timeTextSize = 18
     ChatUIConfig.shared.messageProperties.userNickColor = UIColor.ne_redText
@@ -32,8 +32,8 @@ public class CustomConfig {
     ChatUIConfig.shared.messageProperties.receiveMessageTextColor = UIColor.blue
     ChatUIConfig.shared.messageProperties.selfMessageTextSize = 14
     ChatUIConfig.shared.messageProperties.receiveMessageTextSize = 12
-    ChatUIConfig.shared.messageProperties.rightBubbleBg = UIImage(named: "copy_right")
-    ChatUIConfig.shared.messageProperties.leftBubbleBg = UIImage(named: "copy_right")
+    ChatUIConfig.shared.messageProperties.selfMessageBgImage = UIImage(named: "copy_right")
+    ChatUIConfig.shared.messageProperties.receiveMessageBgImage = UIImage(named: "copy_right")
     ChatUIConfig.shared.messageProperties.showP2pMessageStatus = false
     ChatUIConfig.shared.messageProperties.showTeamMessageStatus = false
     //    ChatUIConfig.shared.messageProperties.showTitleBar = false
diff --git a/app/Custom/CustomContactViewController.swift b/app/Custom/CustomContactViewController.swift
@@ -0,0 +1,79 @@
+// Copyright (c) 2022 NetEase, Inc. All rights reserved.
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+import Foundation
+import NEContactUIKit
+
+public class CustomContactViewController: ContactViewController, NEBaseContactViewControllerDelegate {
+  override public init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
+    /// 是否在通讯录界面显示头部模块
+    ContactUIConfig.shared.showHeader = false
+
+    /// 通讯录列表头部模块的数据回调
+    ContactUIConfig.shared.headerData = { viewController, headerData in
+      headerData[0].name = "收到的验证消息"
+    }
+
+    super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+    delegate = self
+    cellRegisterDic[ContactCellType.ContactCutom.rawValue] = CustomContactTableViewCell.self
+  }
+
+  required init?(coder: NSCoder) {
+    super.init(coder: coder)
+  }
+
+  override open func viewDidLoad() {
+    // 通过重写实现自定义，该方式需要继承自 ChatViewController
+    //      customByOverread()
+
+    super.viewDidLoad()
+  }
+
+  /// 通过重写实现自定义布局(这种方式需要继承，从而拿到父类属性)
+  func customByOverread() {
+    // 顶部bodyTopView中添加自定义view（需要设置bodyTopView的高度）
+    customTopView.button.setTitle("通过重写方式添加", for: .normal)
+    bodyTopView.addSubview(customTopView)
+    bodyTopViewHeight = 80
+
+    // 底部bodyBottomView中添加自定义view（需要设置bodyBottomView的高度）
+    customBottomView.button.setTitle("通过重写方式添加", for: .normal)
+    bodyBottomView.addSubview(customBottomView)
+    bodyBottomViewHeight = 60
+  }
+
+  // 通过继承方式重写次最右侧按钮点击事件, 这种方式会覆盖配置项中的点击事件
+  override open func searchAction() {
+    bodyTopViewHeight = 80
+    bodyBottomViewHeight = 80
+  }
+
+  // 通过继承方式重写最右侧按钮点击事件, 这种方式会覆盖配置项中的点击事件
+  override open func didClickAddBtn() {
+    bodyTopViewHeight = 0
+    bodyBottomViewHeight = 0
+  }
+
+  //  父类加载完数据后会调用此方法，可在此对数据进行二次处理
+  open func onDataLoaded() {
+    for info in viewModel.contactSections[1].contacts {
+      info.contactCellType = ContactCellType.ContactCutom
+    }
+  }
+
+  // MARK: lazy load
+
+  public lazy var customTopView: CustomView = {
+    let view = CustomView(frame: CGRect(x: 0, y: 10, width: NEConstant.screenWidth, height: 40))
+    view.backgroundColor = .blue
+    return view
+  }()
+
+  public lazy var customBottomView: CustomView = {
+    let view = CustomView(frame: CGRect(x: 0, y: 10, width: NEConstant.screenWidth, height: 40))
+    view.backgroundColor = .green
+    return view
+  }()
+}
diff --git a/app/Custom/CustomP2PChatViewController.swift b/app/Custom/CustomP2PChatViewController.swift
@@ -171,6 +171,9 @@ class CustomP2PChatViewController: P2PChatViewController {
     // 例如设置自定义消息高度
     if model.type == .custom {
       if model.customType == customMessageType {
+        // 设置气泡宽高，不设置则不展示气泡
+        model.contentSize = CGSize(width: 20, height: 20)
+        // 设置 cell 高度
         model.height = 50
       }
     }
diff --git a/app/en.lproj/Localizable.strings b/app/en.lproj/Localizable.strings
@@ -78,4 +78,5 @@
 "privatized_configuration"="Privatized configuration";
 "login_by_account"="login";
 "security_warning"="For test only. Beware of money transfer, lottery winnings & strange call scams.";
-"login_token_expired"="Login authentication failed, please login again.";
+"login_token_expired"="Session expired. Please login again.";
+"account_forbidden"="User Banned";
diff --git a/app/zh-Hans.lproj/Localizable.strings b/app/zh-Hans.lproj/Localizable.strings
@@ -77,4 +77,5 @@
 "privatized_configuration"="私有化配置";
 "login_by_account"="账号登录";
 "security_warning"="仅用于体验云信IM 产品功能，请勿轻信汇款、中奖等涉及钱款的信息，勿轻易拨打陌生电话，谨防上当受骗。";
-"login_token_expired"="登录鉴权失效，请重新登录。";
+"login_token_expired"="登录信息失效，请重新登录。";
+"account_forbidden"="用户已被封禁";
