昵称被挤压问题修复

liushiyu
1 parent 2536d551
Showing 2 changed files with 25 additions and 23 deletions
metaCode/Classes/Main/VideoPage/Model/CNLiveShortVideoHomeModel.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoCommentListView.swift
@@ -31,8 +31,8 @@ class ShortVideoHomeCommentListModel: BaseModel {
             tableView_h += replyModel.cellH
         }
         if replyData.replyCount ?? 0 > 2 {
-            tableView_top += 30.0
-            cell_h += 30
+            tableView_top += adapt_length(length: 30)
+            cell_h += adapt_length(length: 30)
         }
         cell_h += tableView_h
     }
@@ -60,7 +60,7 @@ class ShortVideoHomeCommentFListModel: BaseModel {
     var iconSize: CGSize = CGSize(width: 50, height: 50)
     var textLayout: YYTextLayout!
     var nickLayout: YYTextLayout!
-    var cellH: CGFloat! = 50.0
+    var cellH: CGFloat! = adapt_length(length: 50)
     override func didFinishMapping() {
         super.didFinishMapping()
@@ -72,17 +72,18 @@ class ShortVideoHomeCommentFListModel: BaseModel {
         let attributes = NSMutableAttributedString(attributedString: temp_string)
         attributes.addAttribute(NSAttributedString.Key.foregroundColor, value: HexColor("#333333")!, range: NSRange(location: 0, length: temp_string.length))
         attributes.addAttribute(NSAttributedString.Key.font, value: medium_adapt_font(pointSize: 16), range: NSRange(location: 0, length: temp_string.length))
-        let textContainer = YYTextContainer(size: CGSize(width: KSreenWidth-80, height: CGFloat(HUGE)))
+        let textContainer = YYTextContainer(size: CGSize(width: KSreenWidth-adapt_length(length: 80), height: CGFloat(HUGE)))
         textContainer.linePositionModifier = modifier;
         let textLayout = YYTextLayout(container: textContainer, text: attributes)
         self.textLayout = textLayout
         self.cellH += (textLayout?.textBoundingRect.size.height ?? 0)
+        let nick_modifier = CNLiveShortVideoMateCodeLinePositionModifier(font: medium_adapt_font(pointSize: 12), paddingTop: 0, paddingBottom: 0, lineHeightMultiple: 1.5)
         let textAttributedString = NSMutableAttributedString.init(string: self.nick ?? "")
         textAttributedString.addAttribute(NSAttributedString.Key.foregroundColor, value: HexColor("#AFAFAF")!, range: NSRange(location: 0, length: textAttributedString.length))
         textAttributedString.addAttribute(NSAttributedString.Key.font, value: medium_adapt_font(pointSize: 12), range: NSRange(location: 0, length: textAttributedString.length))
-        let nickContainer = YYTextContainer(size: CGSize(width: KSreenWidth-80, height: 20))
-        nickContainer.linePositionModifier = modifier;
+        let nickContainer = YYTextContainer(size: CGSize(width: KSreenWidth-adapt_length(length: 80), height: CGFloat(HUGE)))
+        nickContainer.linePositionModifier = nick_modifier;
         self.nickLayout = YYTextLayout(container: nickContainer, text: textAttributedString)
         self.cellH += (self.nickLayout?.textBoundingRect.size.height ?? 0)
     }
@@ -115,7 +116,7 @@ class ShortVideoHomeCommentRListItemModel: BaseModel {
     var textLayout: YYTextLayout!
     var nickLayout: YYTextLayout!
-    var cellH: CGFloat! = 50.0
+    var cellH: CGFloat! = adapt_length(length: 50)
     override func didFinishMapping() {
         super.didFinishMapping()
@@ -127,18 +128,19 @@ class ShortVideoHomeCommentRListItemModel: BaseModel {
         let attributes = NSMutableAttributedString(attributedString: temp_string)
         attributes.addAttribute(NSAttributedString.Key.foregroundColor, value: HexColor("#333333")!, range: NSRange(location: 0, length: temp_string.length))
         attributes.addAttribute(NSAttributedString.Key.font, value: medium_adapt_font(pointSize: 16), range: NSRange(location: 0, length: temp_string.length))
-        let textContainer = YYTextContainer(size: CGSize(width: KSreenWidth-80-40, height: CGFloat(HUGE)))
+        let textContainer = YYTextContainer(size: CGSize(width: KSreenWidth-adapt_length(length: 120), height: CGFloat(HUGE)))
         textContainer.linePositionModifier = modifier;
         self.textLayout = YYTextLayout(container: textContainer, text: attributes)
         self.cellH += (self.textLayout?.textBoundingRect.size.height ?? 0)
+        let nick_modifier = CNLiveShortVideoMateCodeLinePositionModifier(font: medium_adapt_font(pointSize: 12), paddingTop: 0, paddingBottom: 0, lineHeightMultiple: 1.5)
         let textAttributedString = NSMutableAttributedString.init(string: "\(self.fromNick ?? "")  ??  \(self.toNick ?? "")")
         textAttributedString.addAttribute(NSAttributedString.Key.foregroundColor, value: HexColor("#AFAFAF")!, range: NSRange(location: 0, length: textAttributedString.length))
         textAttributedString.addAttribute(NSAttributedString.Key.font, value: medium_adapt_font(pointSize: 12), range: NSRange(location: 0, length: textAttributedString.length))
         let attachText = NSAttributedString.yy_attachmentString(withContent: UIImage(named: "short_video_reply_name"), contentMode: .scaleAspectFill, attachmentSize: CGSize(width: adapt_length(length: 8), height: adapt_length(length: 8)), alignTo: medium_adapt_font(pointSize: 12), alignment: .center)
         textAttributedString.replaceCharacters(in: NSRange(location: self.fromNick!.count + 2, length: 2), with: attachText)
-        let nickContainer = YYTextContainer(size: CGSize(width: KSreenWidth-80-40, height: 20))
-        nickContainer.linePositionModifier = modifier;
+        let nickContainer = YYTextContainer(size: CGSize(width: KSreenWidth-adapt_length(length: 120), height: adapt_length(length: 40)))
+        nickContainer.linePositionModifier = nick_modifier;
         self.nickLayout = YYTextLayout(container: nickContainer, text: textAttributedString)
         self.cellH += (self.nickLayout?.textBoundingRect.size.height ?? 0)
     }
@@ -526,7 +526,7 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
         contentView.addSubview(likeButton)
         likeButton.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-10)
-            make.height.equalTo(20)
+            make.height.equalTo(adapt_length(length: 20))
             make.width.equalTo(50)
             make.top.equalTo(commentLabel.snp.bottom).offset(10)
         }
@@ -534,19 +534,19 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
         timeLabel.snp.makeConstraints { make in
             make.top.equalTo(commentLabel.snp.bottom).offset(10)
             make.left.equalTo(titleLabel.snp.left)
-            make.height.equalTo(20)
+            make.height.equalTo(adapt_length(length: 20))
         }
         contentView.addSubview(replyButton)
         replyButton.snp.makeConstraints { make in
             make.left.equalTo(timeLabel.snp.right).offset(10)
-            make.height.equalTo(20)
+            make.height.equalTo(adapt_length(length: 20))
             make.width.equalTo(40)
             make.top.equalTo(commentLabel.snp.bottom).offset(10)
         }
         contentView.addSubview(deleteButton)
         deleteButton.snp.makeConstraints { make in
             make.left.equalTo(replyButton.snp.right).offset(adapt_length(length: 5))
-            make.height.equalTo(20)
+            make.height.equalTo(adapt_length(length: 20))
             make.width.equalTo(40)
             make.top.equalTo(commentLabel.snp.bottom).offset(10)
         }
@@ -554,7 +554,7 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
         replyUnfoldButton.snp.makeConstraints { make in
             make.top.equalTo(timeLabel.snp.bottom)
             make.left.equalTo(titleLabel.snp.left)
-            make.height.equalTo(30)
+            make.height.equalTo(adapt_length(length: 30))
         }
         contentView.addSubview(tableView)
     }
@@ -585,20 +585,20 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
         }
         DispatchQueue.main.async {[weak self] in
             guard let self = self else { return }
-            self.commentLabel.textLayout = commentData.textLayout
-            self.commentLabel.snp.remakeConstraints { make in
-                make.top.equalTo(self.titleLabel.snp.bottom).offset(10)
-                make.left.equalTo(self.iconView.snp.right).offset(10)
-                make.right.equalToSuperview().offset(-10)
-                make.height.equalTo(commentData.textLayout.textBoundingRect.size.height)
-            }
             self.titleLabel.textLayout = commentData.nickLayout
             self.titleLabel.snp.remakeConstraints { make in
                 make.left.equalTo(self.iconView.snp.right).offset(10)
-                make.top.equalToSuperview().offset(10)
+                make.top.equalToSuperview().offset(adapt_length(length: 10))
                 make.right.equalToSuperview().offset(-10)
                 make.height.equalTo(commentData.nickLayout.textBoundingRect.size.height)
             }
+            self.commentLabel.textLayout = commentData.textLayout
+            self.commentLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.titleLabel.snp.bottom).offset(adapt_length(length: 10))
+                make.left.equalTo(self.iconView.snp.right).offset(10)
+                make.right.equalToSuperview().offset(-10)
+                make.height.equalTo(commentData.textLayout.textBoundingRect.size.height)
+            }
             self.tableView.snp.removeConstraints()
             self.tableView.removeFromSuperview()
             if replyData.replyCount ?? 0 > 0 {