v10.9.20 (#457)

Co-authored-by: 张诗文 <zhangshiwen@corp.netease.com>

Author: zsw666

NEChatUIKit/NEChatUIKit/Classes/Chat/Controller/ChatViewController.swift

@@ -494,6 +494,16 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
 
     expandMoreAction()
 
+    // P2P 会话：异步精确校验对方是否为机器人
+    // 由于 isRobot 是同步缓存读取，首次进入时缓存可能为空或过期，
+    // 通过 checkIfRobot 完成后刷新 moreItems，确保音视频按钮显示正确
+    if V2NIMConversationIdUtil.conversationType(ChatRepo.conversationId) == .CONVERSATION_TYPE_P2P {
+      NEAIRobotManager.shared.checkIfRobot(ChatRepo.sessionId) { [weak self] _ in
+        // 无论结果如何，重新计算一次 moreItems（isRobot 缓存已在 checkIfRobot 中更新）
+        self?.expandMoreAction()
+      }
+    }
+
     view.addSubview(jumpDownView)
     jumpDownViewRightAncher = jumpDownView.rightAnchor.constraint(equalTo: view.rightAnchor, constant: -16)
     jumpDownViewRightAncher?.isActive = true
@@ -610,6 +620,9 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
 
     NotificationCenter.default.addObserver(self, selector: #selector(reLoadMoreWithMessage), name: NENotificationName.friendCacheInit, object: nil)
 
+    // Markdown 图片下载完成后刷新对应消息 Cell
+    NotificationCenter.default.addObserver(self, selector: #selector(onMarkdownImageDidLoad(_:)), name: NEMarkdownImageDidLoadNotification, object: nil)
+
     if let pan = navigationController?.interactivePopGestureRecognizer {
       tableView.panGestureRecognizer.require(toFail: pan)
     }
@@ -650,6 +663,28 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
     isCurrentPage = true
   }
 
+  /// Markdown 图片下载完成回调
+  /// 遍历消息列表找到包含该图片 URL 的 AI 流式文本消息，重算高度后刷新对应行
+  open func onMarkdownImageDidLoad(_ notification: Notification) {
+    guard let url = notification.userInfo?["url"] as? String, !url.isEmpty else { return }
+
+    var reloadIndexPaths = [IndexPath]()
+    for (index, model) in viewModel.messages.enumerated() {
+      guard model.type == .aiStreamText,
+            let textModel = model as? MessageAIStreamModel,
+            textModel.message?.text?.contains(url) == true else {
+        continue
+      }
+      // 重新解析 Markdown 并重算高度（图片已缓存，此次直接命中）
+      textModel.resetMessage(textModel.message)
+      reloadIndexPaths.append(IndexPath(row: index, section: 0))
+    }
+
+    if !reloadIndexPaths.isEmpty {
+      tableViewReloadIndexs(reloadIndexPaths)
+    }
+  }
+
   // MARK: - 子类可重写方法
 
   open func onTeamMemberChange(team: V2NIMTeam) {}
@@ -681,7 +716,21 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
       )
       return
     }
-    if let uid = ChatMessageHelper.getSenderId(model?.message) {
+    guard let uid = ChatMessageHelper.getSenderId(model?.message) else { return }
+
+    // P2P 会话中，使用 checkIfRobot 精确判断对方是否为机器人：
+    // 若是机器人则以"去聊天"模式打开名片页（隐藏"添加好友"按钮）
+    if V2NIMConversationIdUtil.conversationType(ChatRepo.conversationId) == .CONVERSATION_TYPE_P2P {
+      NEAIRobotManager.shared.checkIfRobot(uid) { [weak self] isRobot in
+        guard let self = self else { return }
+        var params: [String: Any] = ["nav": self.navigationController as Any, "uid": uid]
+        if isRobot {
+          // 机器人名片：将"添加好友"替换为"去聊天"
+          params["isRobot"] = true
+        }
+        Router.shared.use(ContactUserInfoPageRouter, parameters: params, closure: nil)
+      }
+    } else {
       Router.shared.use(
         ContactUserInfoPageRouter,
         parameters: ["nav": navigationController as Any, "uid": uid],
@@ -3214,7 +3263,8 @@ open class ChatViewController: NEChatBaseViewController, UINavigationControllerD
       }
     }
 
-    if NEAIUserManager.shared.isAIUser(ChatRepo.sessionId) {
+    if NEAIUserManager.shared.isAIUser(ChatRepo.sessionId) ||
+      NEAIRobotManager.shared.isRobot(ChatRepo.sessionId) {
       items = items.filter { item in
         if item.type == .rtc {
           return false

NEChatUIKit/NEChatUIKit/Classes/Chat/Helper/ChatMessageHelper.swift

@@ -165,9 +165,14 @@ public class ChatMessageHelper: NSObject {
     case .MESSAGE_TYPE_VIDEO:
       model = MessageVideoModel(message: message)
     case .MESSAGE_TYPE_TEXT:
+      // 数字人回复的消息使用 Markdown 解析
       if message.aiConfig?.aiStatus == .MESSAGE_AI_STATUS_RESPONSE {
         return MessageAIStreamModel(message: message)
       }
+      // 机器人回复的消息也使用 Markdown 解析（与数字人一致）
+      if let senderId = message.senderId, NEAIRobotManager.shared.isRobot(senderId) {
+        return MessageAIStreamModel(message: message)
+      }
       model = MessageTextModel(message: message)
     case .MESSAGE_TYPE_IMAGE:
       model = MessageImageModel(message: message)
@@ -221,10 +226,16 @@ public class ChatMessageHelper: NSObject {
       model = MessageVideoModel(message: message)
       completion(model)
     case .MESSAGE_TYPE_TEXT:
+      // 数字人回复的消息使用 Markdown 解析
       if message.aiConfig?.aiStatus == .MESSAGE_AI_STATUS_RESPONSE {
         completion(MessageAIStreamModel(message: message))
         return
       }
+      // 机器人回复的消息也使用 Markdown 解析（与数字人一致）
+      if let senderId = message.senderId, NEAIRobotManager.shared.isRobot(senderId) {
+        completion(MessageAIStreamModel(message: message))
+        return
+      }
       model = MessageTextModel(message: message)
       completion(model)
     case .MESSAGE_TYPE_IMAGE:

NEChatUIKit/NEChatUIKit/Classes/Chat/HistorySearch/NEHistorySearchMonthHeaderView.swift

@@ -15,7 +15,7 @@ class NEHistorySearchMonthHeaderView: UICollectionReusableView {
 
   lazy var separatorView: UIView = {
     let view = UIView()
-    view.backgroundColor = UIColor(hexString: "#E5E5E5")
+    view.backgroundColor = .funChatLineBorderColor
     return view
   }()
 

NEChatUIKit/NEChatUIKit/Classes/Chat/Model/MessageAIStreamModel.swift

@@ -29,6 +29,12 @@ open class MessageAIStreamModel: MessageTextModel {
 
     let NEMarkdownParser = NEMarkdownParser(font: .systemFont(ofSize: 16))
     NEMarkdownParser.code.textHighlightColor = .black
+    // 表格宽度 = 消息最大宽度 - 气泡内边距（左右各 chat_cell_margin + 内边距 chat_content_margin）
+    let contentMaxW = chat_content_maxW - chat_content_margin * 2
+    NEMarkdownParser.table.maxWidth = contentMaxW
+    // 图片宽度不超过气泡内容区域
+    NEMarkdownParser.markdownImage.maxWidth = contentMaxW
+    NEMarkdownParser.markdownImage.maxHeight = contentMaxW
 //    NEMarkdownParser.code.font = UIFont(name: "Times New Roman", size: 16)
     let mulAttr = NEMarkdownParser.parse(message?.text ?? "")
     attributeStr = NSMutableAttributedString(attributedString: mulAttr)

NEChatUIKit/NEChatUIKit/Classes/Markdown/NEMarkdownCodeEscaping.swift

@@ -5,18 +5,34 @@
 import Foundation
 
 open class NEMarkdownCodeEscaping: NEMarkdownElement {
-  fileprivate static let regex = "(\\s+|^)(?<!\\\\)(?:\\\\\\\\)*+(\\`+)(.+?)(\\2)"
+  // 两个分支合并为一个正则，不使用 .dotMatchesLineSeparators：
+  // 分支1 — 多反引号(2+)：内容可跨行（用 [\s\S]+? 匹配包含换行的任意字符）
+  //         groups: (2)=backticks  (3)=content  (4)=closing backticks
+  // 分支2 — 单反引号：内容不含换行和反引号（[^\n`]+），防止跨行误吞 Markdown 语法
+  //         groups: (5)=backtick   (6)=content  (7)=closing backtick
+  fileprivate static let regex = "(\\s+|^)(?<!\\\\)(?:\\\\\\\\)*+(?:(\\`{2,})([\\s\\S]+?)(\\2)|(\\`)([^\\n`]+)(\\5))"
 
   open var regex: String {
     NEMarkdownCodeEscaping.regex
   }
 
   open func regularExpression() throws -> NSRegularExpression {
-    try NSRegularExpression(pattern: regex, options: .dotMatchesLineSeparators)
+    // 不使用 .dotMatchesLineSeparators，跨行逻辑已在正则内部通过 [\s\S] 处理
+    try NSRegularExpression(pattern: regex, options: [])
   }
 
   open func match(_ match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {
-    let range = match.range(at: 3)
+    // 根据匹配的分支确定 content 所在的 group 索引
+    // 分支1（多反引号）：group 3
+    // 分支2（单反引号）：group 6
+    let contentGroupIndex: Int
+    if match.numberOfRanges > 2, match.range(at: 2).location != NSNotFound {
+      contentGroupIndex = 3
+    } else {
+      contentGroupIndex = 6
+    }
+
+    let range = match.range(at: contentGroupIndex)
     // escaping all characters
     let matchString = attributedString.attributedSubstring(from: range).string
     let escapedString = [UInt16](matchString.utf16)
@@ -26,4 +42,4 @@ open class NEMarkdownCodeEscaping: NEMarkdownElement {
       }
     attributedString.replaceCharacters(in: range, with: escapedString)
   }
-}
+}

NEChatUIKit/NEChatUIKit/Classes/Markdown/NEMarkdownHorizontalRule.swift

@@ -0,0 +1,104 @@
+// 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
+
+/// 分隔线渲染 Element。
+///
+/// 支持标准 GFM 分隔线语法：
+/// ```
+/// ---
+/// ***
+/// ___
+/// - - -
+/// * * *
+/// ```
+/// （单独一行，由 3 个或以上 `-` `*` `_` 组成，允许中间有空格）
+///
+/// 渲染效果：将分隔线替换为一行视觉横线。
+/// 使用自定义 `NSTextAttachment`，在 `attachmentBounds` 中根据
+/// `proposedLineFragment` 自适应气泡宽度，不会超出右边界。
+open class NEMarkdownHorizontalRule: NEMarkdownElement {
+  // 匹配以 - * _ 组成的分隔线（3 个或以上，允许字符间有空格，整行只有这些字符）
+  public let regex = "^[ \\t]*([\\-\\*\\_][ \\t]*){3,}[ \\t]*$"
+
+  public func regularExpression() throws -> NSRegularExpression {
+    try NSRegularExpression(pattern: regex, options: [.anchorsMatchLines])
+  }
+
+  // MARK: - 样式配置
+
+  /// 分隔线颜色
+  open var lineColor: UIColor = UIColor(red: 0.78, green: 0.78, blue: 0.78, alpha: 1)
+  /// 分隔线高度（pt）
+  open var lineHeight: CGFloat = 1.0
+  /// 分隔线上下的额外间距
+  open var verticalPadding: CGFloat = 6.0
+
+  public init(lineColor: UIColor? = nil) {
+    if let c = lineColor { self.lineColor = c }
+  }
+
+  // MARK: - NEMarkdownElement
+
+  public func match(_ match: NSTextCheckingResult,
+                    attributedString: NSMutableAttributedString) {
+    let attachment = NEMarkdownHorizontalRuleAttachment(
+      lineColor: lineColor,
+      lineHeight: lineHeight,
+      verticalPadding: verticalPadding
+    )
+    let lineAttrStr = NSAttributedString(attachment: attachment)
+    attributedString.replaceCharacters(in: match.range, with: lineAttrStr)
+  }
+}
+
+// MARK: - 自适应宽度的分隔线 Attachment
+
+/// 在 `attachmentBounds` 阶段根据 `proposedLineFragment` 动态计算宽度，
+/// 确保分隔线始终与气泡内容区域等宽，不会超出右边界。
+private class NEMarkdownHorizontalRuleAttachment: NSTextAttachment {
+  let lineColor: UIColor
+  let lineHeight: CGFloat
+  let verticalPadding: CGFloat
+
+  init(lineColor: UIColor, lineHeight: CGFloat, verticalPadding: CGFloat) {
+    self.lineColor = lineColor
+    self.lineHeight = lineHeight
+    self.verticalPadding = verticalPadding
+    super.init(data: nil, ofType: nil)
+  }
+
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) is not supported")
+  }
+
+  /// 根据所在文本容器的行宽自适应 Attachment 尺寸
+  override func attachmentBounds(for textContainer: NSTextContainer?,
+                                 proposedLineFragment lineFrag: CGRect,
+                                 glyphPosition position: CGPoint,
+                                 characterIndex charIndex: Int) -> CGRect {
+    // 宽度 = 当前行的可用宽度（自动匹配气泡宽度）
+    let width = lineFrag.width
+    let height = lineHeight + verticalPadding * 2
+    return CGRect(origin: .zero, size: CGSize(width: width, height: height))
+  }
+
+  /// 按实际 bounds 尺寸动态绘制横线图片
+  override func image(forBounds imageBounds: CGRect,
+                      textContainer: NSTextContainer?,
+                      characterIndex charIndex: Int) -> UIImage? {
+    let size = imageBounds.size
+    guard size.width > 0, size.height > 0 else { return nil }
+    let renderer = UIGraphicsImageRenderer(size: size)
+    return renderer.image { ctx in
+      lineColor.setFill()
+      let lineRect = CGRect(x: 0,
+                            y: verticalPadding,
+                            width: size.width,
+                            height: lineHeight)
+      ctx.fill(lineRect)
+    }
+  }
+}