资源页列表UI调整

galaxy/galaxy/Classes/Modules/Community(社区)/Resource(资源)/V/YHResourceTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import Kingfisher
+import AttributedString
 
 class YHResourceTableViewCell: UITableViewCell {
     static let labelFont = UIFont.PFSC_R(ofSize: 14)
@@ -38,12 +39,6 @@ class YHResourceTableViewCell: UITableViewCell {
         return view
     }()
     
-    lazy var vSeparatorLine: UIView = {
-        let view = UIView()
-        view.backgroundColor = UIColor.brandGrayColor3
-        return view
-    }()
-    
     // 左侧LOGO
     lazy var logoImageView: UIImageView = {
         let imageView = UIImageView()
@@ -76,21 +71,13 @@ class YHResourceTableViewCell: UITableViewCell {
         return label
     }()
     
-    // 公司名称
-    lazy var companyLabel: UILabel = {
-        let label = UILabel()
-        label.font = UIFont.PFSC_R(ofSize: 12)
-        label.textColor = UIColor.brandGrayColor7
-        label.numberOfLines = 1
-        return label
-    }()
-    
-    // 行业标签
-    lazy var industryLabel: UILabel = {
+    // 公司名称&行业复合显示
+    lazy var companyDetailLabel: UILabel = {
         let label = UILabel()
         label.font = UIFont.PFSC_R(ofSize: 12)
         label.textColor = UIColor.brandGrayColor7
-        label.numberOfLines = 1
+        label.numberOfLines = 2
+        label.textAlignment = .left
         return label
     }()
 
@@ -115,10 +102,8 @@ extension YHResourceTableViewCell {
         contentView.addSubview(rightArrow)
         contentView.addSubview(typeTagIcon)
         contentView.addSubview(titleLabel)
-        contentView.addSubview(companyLabel)
-        contentView.addSubview(industryLabel)
         contentView.addSubview(separatorLine)
-        contentView.addSubview(vSeparatorLine)
+        contentView.addSubview(companyDetailLabel)
         
         setupConstraints()
     }
@@ -129,6 +114,7 @@ extension YHResourceTableViewCell {
             make.left.equalToSuperview().offset(YHResourceTableViewCell.marginX)
             make.top.equalToSuperview().offset(24)
             make.width.height.equalTo(YHResourceTableViewCell.logoWidth)
+            make.bottom.lessThanOrEqualToSuperview().offset(-32)
         }
                 
         // 右上角标签约束
@@ -139,6 +125,12 @@ extension YHResourceTableViewCell {
             make.width.equalTo(52)
         }
         
+        rightArrow.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-YHResourceTableViewCell.marginX)
+            make.width.height.equalTo(YHResourceTableViewCell.arrowWidth)
+            make.top.equalTo(typeTagIcon.snp.bottom).offset(4)
+        }
+        
         // 主标题约束
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(logoImageView.snp.right).offset(YHResourceTableViewCell.logoToRight)
@@ -146,32 +138,14 @@ extension YHResourceTableViewCell {
             make.top.equalTo(typeTagIcon.snp.bottom).offset(4)
         }
         
-        rightArrow.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-YHResourceTableViewCell.marginX)
-            make.width.height.equalTo(YHResourceTableViewCell.arrowWidth)
-            make.top.equalTo(titleLabel)
-        }
-        
         // 公司名称约束
-        companyLabel.snp.makeConstraints { make in
+        companyDetailLabel.snp.makeConstraints { make in
             make.left.equalTo(titleLabel)
             make.top.equalTo(titleLabel.snp.bottom).offset(4)
+            make.bottom.lessThanOrEqualToSuperview().offset(-32)
+            make.right.equalTo(rightArrow.snp.left)
         }
         
-        vSeparatorLine.snp.makeConstraints { make in
-            make.left.equalTo(companyLabel.snp.right).offset(YHResourceTableViewCell.marginBetweenVLine)
-            make.centerY.equalTo(companyLabel)
-            make.width.equalTo(1)
-            make.height.equalTo(8)
-        }
-        
-        // 行业标签约束
-        industryLabel.snp.makeConstraints { make in
-            make.left.equalTo(vSeparatorLine.snp.right).offset(YHResourceTableViewCell.marginBetweenVLine)
-            make.right.lessThanOrEqualTo(rightArrow.snp.left)
-            make.top.equalTo(companyLabel)
-            make.bottom.equalToSuperview().offset(-32)
-        }
         let pixelOne = 1.0 / UIScreen.main.scale
         // 分割线约束
         separatorLine.snp.makeConstraints { make in
@@ -192,9 +166,12 @@ extension YHResourceTableViewCell {
         
         // 设置基本信息 - 使用新的API字段
         titleLabel.text = getServiceOrDemandText(model: model)  // 显示服务或需求信息
-        companyLabel.text = model.displayName  // 使用 company_name
-        industryLabel.text = model.industryDisplayText  // 使用 industry_type_str
+        let companyName = model.displayName.count > 20 ? model.displayName.prefix(20) + "..." : model.displayName
+        let industry = model.industryDisplayText.count > 20 ? model.industryDisplayText.prefix(20) + "..." : model.industryDisplayText
         
+        let tipsIcon = ASAttributedString.init(.image(UIImage(named: "company_detail_vline") ?? UIImage(), .custom(.offset(CGPoint(x: 0, y: -2.0)), size: .init(width: 1, height: 8))))
+        let contentAtt = (ASAttributedString(string: "\(companyName)  ", .foreground(UIColor.brandGrayColor7), .font(UIFont.PFSC_R(ofSize: 12))) + tipsIcon + ASAttributedString(string: "  \(industry)", .foreground(UIColor.brandGrayColor7), .font(UIFont.PFSC_R(ofSize: 12))))
+        companyDetailLabel.attributed.text = contentAtt
         // 设置Logo - 使用新的API字段
         if !model.companyLogoUrl.isEmpty {
             logoImageView.kf.setImage(

galaxy/galaxy/Res/Assets.xcassets/Community/Resource/company_detail_vline.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "company_detail_vline@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "company_detail_vline@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}