预览简历-工作记录和获奖情况排版问题 , 预览图片问题

“张旭”
1 parent 490ef8f1
Showing 3 changed files with 37 additions and 17 deletions
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourWorkAwardCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
@@ -40,10 +40,10 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell,UITableViewDelegate,UI
         }
     }
  
-    lazy var images: [HeroBrowserViewModuleBaseProtocol] = {
-        var list: [HeroBrowserViewModuleBaseProtocol] = []
-        return list
-    }()
+//    lazy var images: [HeroBrowserViewModuleBaseProtocol] = {
+//        var list: [HeroBrowserViewModuleBaseProtocol] = []
+//        return list
+//    }()
  
     var vitaeWorkPreviewVideoPhotoBlock:VitaeWorkPreviewVideoPhotoBlock?
     var vitaePreviewWorkCellChangedBlock:vitaePreviewWorkCellChangedBlockActionBlock?
@@ -203,7 +203,7 @@ class CNLiveDigitalResumePreviewFourCell: UITableViewCell,UITableViewDelegate,UI
             cell.awardModel = awardMdl
         }
         cell.vitaeWorkPreviewVideoPhotoBlock = { images , index in
-            self.vitaeWorkPreviewVideoPhotoBlock?(self.images, index)
+            self.vitaeWorkPreviewVideoPhotoBlock?(images, index)
         }
         cell.vitaePreviewWorkCellChangedBlock = {index ,jianjieHeight,isExpand in
             self.vitaePreviewWorkCellChangedBlock?(index ,jianjieHeight,isExpand)
@@ -209,13 +209,6 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             make.right.equalToSuperview().offset(-20)
             make.height.equalTo(40)
         }
-        self.contentView.addSubview(self.expandBtn)
-        self.expandBtn.snp.makeConstraints { make in
-            make.top.equalTo(self.jianjieLabel.snp.bottom)
-            make.right.equalTo(self.jianjieLabel.snp.right)
-            make.width.equalTo(60)
-            make.height.equalTo(30)
-        }
  
         let lines = jianjieLabel.getRealLabelTextLines()
         if lines <= 2{
@@ -231,6 +224,13 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             make.width.equalToSuperview()
             make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
         }
+        self.contentView.addSubview(self.expandBtn)
+        self.expandBtn.snp.makeConstraints { make in
+            make.top.equalTo(self.jianjieLabel.snp.bottom)
+            make.right.equalTo(self.jianjieLabel.snp.right)
+            make.width.equalTo(60)
+            make.height.equalTo(30)
+        }
         self.contentView.addSubview(self.dingweiImgView)
         self.dingweiImgView.snp.makeConstraints { make in
             make.left.equalTo(self.workNameTitleLabel.snp.left)
@@ -259,11 +259,21 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
         if model.companyName.count > 0{
             self.workPositionTitleLabel.text = model.companyName
             self.workPositionTitleLabel.isHidden = false
+            self.workPositionTitleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
+                make.left.equalTo(self.workNameTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-15)
+            }
+            self.workTimeTitleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(5)
+                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-15)
+            }
         }else{
             self.workPositionTitleLabel.isHidden = true
             self.workTimeTitleLabel.snp.remakeConstraints { make in
                 make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
-                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.left.equalTo(self.workNameTitleLabel.snp.left)
                 make.right.equalToSuperview().offset(-15)
             }
         }
@@ -403,11 +413,21 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
         if model.company.count > 0{
             self.workPositionTitleLabel.text = model.company
             self.workPositionTitleLabel.isHidden = false
+            self.workPositionTitleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workProfessionTitleLabel.snp.bottom).offset(5)
+                make.left.equalTo(self.workNameTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-15)
+            }
+            self.workTimeTitleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(5)
+                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-15)
+            }
         }else{
             self.workPositionTitleLabel.isHidden = true
             self.workTimeTitleLabel.snp.remakeConstraints { make in
-                make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(5)
-                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.top.equalTo(self.workProfessionTitleLabel.snp.bottom).offset(5)
+                make.left.equalTo(self.workProfessionTitleLabel.snp.left)
                 make.right.equalToSuperview().offset(-15)
             }
         }
@@ -542,7 +562,7 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             jienjieH = CGFloat(lines)*height
         }else{
             //文本展开状态,点击收起
-            jienjieH = 2*height
+            jienjieH = 2*height+2
         }
         self.jianjieLabel.snp.remakeConstraints { make in
             make.top.equalTo(self.workTimeTitleLabel.snp.bottom).offset(10)
@@ -121,7 +121,7 @@ class CNLiveViateAwardModelLayout:NSObject{
             _awardModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+55
         }else{//预览获奖
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
-            _awardModel?.cellH = Float(162-58-25)+companyH+descH+Float(hang*imgWH)//+55
+            _awardModel?.cellH = Float(162-58-25-25)+companyH+descH+Float(hang*imgWH)//+55
         }
     }
     func getCellHModel()->CNLiveVitaeAwardsModel{