修改标签匹配方法

rztime · Oct 16, 2023 · fd64654 · fd64654
1 parent e9d9738
commit fd64654
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/RZRichTextView/Classes/RZCss.swift b/RZRichTextView/Classes/RZCss.swift
@@ -170,11 +170,11 @@ public extension NSTextAttachment {
         guard let info = self.rzattachmentInfo else { return ""}
         switch info.type {
         case .audio:
-            return "<audio src=\"\(info.src ?? "")\" controls=\"controls\" style=\"max-width:100%;\"></audio>"
+            return "<audio src=\"\(info.src ?? "")\" controls=\"controls\" style=\"max-width:100%;\">您的浏览器不支持此音频格式</audio>"
         case .image:
             return "<img src=\"\(info.src ?? "")\" style=\"max-width:100%;\">"
         case .video:
-            return "<video src=\"\(info.src ?? "")\" poster=\"\(info.poster ?? "")\" controls=\"controls\" style=\"max-width:100%;\"></video>"
+            return "<video src=\"\(info.src ?? "")\" poster=\"\(info.poster ?? "")\" controls=\"controls\" style=\"max-width:100%;\">您的浏览器不支持此视频格式</video>"
         }
     }
 }

diff --git a/RZRichTextView/Classes/RZHtml.swift b/RZRichTextView/Classes/RZHtml.swift
@@ -266,7 +266,7 @@ public extension String {
         var tempHtml = html as NSString
         var attachments: [RZAttachmentInfo] = []
         /// 找音、视频、图片
-        let regrule = #"(<video\s+.*?src\s*=\s*([^ <>]+)\b.*?>(.*?)</video>)|(<audio\s+.*?src\s*=\s*([^ <>]+)\b.*?>(.*?)</audio>)|(<img\s+.*?src\s*=\s*([^ <>]+)\b.*?>)"#
+        let regrule = #"(<video\s+.*?src\s*=\s*([^ <>]+)\b.*?>([\s\S]*?)</video>)|(<audio\s+.*?src\s*=\s*([^ <>]+)\b.*?>([\s\S]*?)</audio>)|(<img\s+.*?src\s*=\s*([^ <>]+)\b.*?>)"#
         if let regex = try? NSRegularExpression.init(pattern: regrule, options: .caseInsensitive) {
             var labels:[RZLabelInfo] = []
             let matches = regex.matches(in: tempHtml as String, range: NSRange.init(location: 0, length: tempHtml.length))