工作记录/获奖情况 , image加到了一个图片总容器里

工作记录列表页-没有位置授权,图片超出了横线 * [x] 工作记录列表页-描述和时间间隔比较大

工作记录/获奖情况 , image加到了一个图片总容器里
工作记录列表页-没有位置授权,图片超出了横线 * [x] 工作记录列表页-描述和时间间隔比较大
“张旭”
1 parent ce82210b
Showing 3 changed files with 75 additions and 15 deletions
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkSecCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
@@ -105,8 +105,9 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
                         make.right.equalToSuperview().offset(-15)
                         make.height.equalTo(whiteH)
                     }
-                    self.updateAddWorkSecCellHeightBlock!(self, whiteH+20)
-
+                    if self.updateAddWorkSecCellHeightBlock != nil{
+                        self.updateAddWorkSecCellHeightBlock!(self, whiteH+20)
+                    }
                 }
                 _selectUploadImageView?.endUploadImageCallBack = {
                     let imageUrl = self.selectUploadImageView?.getCurrentSelectImageUrls().first
@@ -125,7 +125,11 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         expandBtn.addTarget(self, action: #selector(expandBtnAction), for: .touchUpInside)
         return expandBtn
     }()
-    
+    lazy var imagesTotalView :UIView = {
+        let whiteBgView = UIView()
+        whiteBgView.tag = 1100
+        return whiteBgView
+    }()
     lazy var dingweiImgView :UIImageView = {
         let iconImgView = UIImageView()
         iconImgView.image = UIImage(named: "mine_jinali_workdingwei")
@@ -224,6 +228,14 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             self.expandBtn.isHidden = false
         }
  
+        self.whiteBgView.addSubview(self.imagesTotalView)
+        self.imagesTotalView.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-54-15)
+            make.width.equalToSuperview()
+            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+        }
+
         self.whiteBgView.addSubview(self.dingweiImgView)
         self.dingweiImgView.snp.makeConstraints { make in
             make.left.equalTo(15)
@@ -241,7 +253,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             make.height.equalTo(0.5)
             make.left.equalTo(15)
             make.right.equalToSuperview().offset(-15)
-            make.top.equalTo(self.workDingWeiTitleLabel.snp.bottom).offset(15)
+            make.bottom.equalToSuperview().offset(-54)
         }
         self.whiteBgView.addSubview(self.realImgView)
         self.realImgView.snp.makeConstraints { make in
@@ -273,7 +285,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
  
     //获奖
     func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
-        self.whiteBgView.subviews.forEach { view in
+        self.imagesTotalView.subviews.forEach { view in
             if view.tag >= 1000{
                 view.removeFromSuperview()
             }
@@ -283,7 +295,12 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         let startDateString = convertTimestampStringToDateString(timestampString: model.time)
         self.workNameTitleLabel.text = startDateString ?? ""
  
-        self.workPositionTitleLabel.text = model.company
+        if model.company.count > 0{
+            self.workPositionTitleLabel.text = model.company
+            self.workPositionTitleLabel.isHidden = false
+        }else{
+            self.workPositionTitleLabel.isHidden = true
+        }
  
         self.jianjieLabel.text = model.description//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
         let lines = jianjieLabel.getRealLabelTextLines()
@@ -317,7 +334,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 let imgLeftGap:Float = 15
                 let lie = i%3
                 let hang = i/3
-                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang)), width: CGFloat(imgWH), height: CGFloat(imgWH)))//                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
                 imgView.isUserInteractionEnabled = true
                 imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
                 imgView.tag = 1000+i
@@ -325,7 +342,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 let imgUrl = imgArr[i]
                 imgView.clipsToBounds = true
                 imgView.layer.cornerRadius = 5
-                self.whiteBgView.addSubview(imgView)
+                self.imagesTotalView.addSubview(imgView)
  
                 if imgUrl.contains("vitae_video_"){
                     //是视频
@@ -354,10 +371,17 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             }
         }
         self.workDingWeiTitleLabel.isHidden = true
+        self.dingweiImgView.isHidden = true
+        self.imagesTotalView.snp.remakeConstraints { make in
+            make.left.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-54-15)
+            make.width.equalToSuperview()
+            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+        }
     }
     //工作
     func setupNewUI(model:CNLiveVitaeWorksModel){
-        self.whiteBgView.subviews.forEach { view in
+        self.imagesTotalView.subviews.forEach { view in
             if view.tag >= 1000{
                 view.removeFromSuperview()
             }
@@ -371,8 +395,14 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         }else{
             self.workNameTitleLabel.text = model.position+" | "+(startDateString ?? "")+" - "+endDateString!
         }
-        self.workPositionTitleLabel.text = model.companyName
-        
+        if model.companyName.count > 0{
+            self.workPositionTitleLabel.text = model.companyName
+            self.workPositionTitleLabel.isHidden = false
+            self.jianjieLabel.top = 113
+        }else{
+            self.workPositionTitleLabel.isHidden = true
+            self.jianjieLabel.top = 113 - 25
+        }
         self.jianjieLabel.text = model.jobDuties//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
         let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
@@ -405,7 +435,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 let imgLeftGap:Float = 15
                 let lie = i%3
                 let hang = i/3
-                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang)), width: CGFloat(imgWH), height: CGFloat(imgWH)))//                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
                 imgView.isUserInteractionEnabled = true
                 imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
                 imgView.tag = 1000+i
@@ -413,7 +443,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 let imgUrl = imgArr[i]
                 imgView.clipsToBounds = true
                 imgView.layer.cornerRadius = 5
-                self.whiteBgView.addSubview(imgView)
+                self.imagesTotalView.addSubview(imgView)
  
                 if imgUrl.contains("vitae_video_"){
                     //是视频
@@ -445,9 +475,23 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         let cityStr = model.city
         if cityStr.count == 0 || cityStr == "请选择"{
             self.workDingWeiTitleLabel.isHidden = true
+            self.dingweiImgView.isHidden = true
+            self.imagesTotalView.snp.remakeConstraints { make in
+                make.left.equalToSuperview()
+                make.bottom.equalToSuperview().offset(-54-15)
+                make.width.equalToSuperview()
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }
         }else{
             self.workDingWeiTitleLabel.isHidden = false
             self.workDingWeiTitleLabel.text = model.city
+            self.dingweiImgView.isHidden = false
+            self.imagesTotalView.snp.remakeConstraints { make in
+                make.left.equalToSuperview()
+                make.bottom.equalTo(self.dingweiImgView.snp.top).offset(-5)
+                make.width.equalToSuperview()
+                make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
+            }
         }
  
     }
@@ -28,6 +28,14 @@ class CNLiveViateWorkModelLayout:NSObject{
         super.init()
         model.isExpand = isExpand
         self.workModel = model
+        var companyH:Float = 25
+        let companyStr = model.companyName
+        if companyStr.count == 0 || companyStr == ""{
+            companyH = 0
+        }else{
+            companyH = 25
+        }
+
         let imgArr = model.imgs.components(separatedBy: ",")
         var hang:Float = 1
         if imgArr.count > 0{
@@ -52,7 +60,7 @@ class CNLiveViateWorkModelLayout:NSObject{
             cityH = 35
         }
         if isPreview == false{//工作记录详情页
-            _workModel?.cellH = Float(123)+descH+Float(hang*imgWH)+cityH+55
+            _workModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+cityH+55
         }else{//预览工作记录
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
             _workModel?.cellH = Float(162)+descH+Float(hang*imgWH)+cityH+55
@@ -86,6 +94,13 @@ class CNLiveViateAwardModelLayout:NSObject{
         super.init()
         model.isExpand = isExpand
         self.awardModel = model
+        var companyH:Float = 25
+        let companyStr = model.company
+        if companyStr.count == 0 || companyStr == ""{
+            companyH = 0
+        }else{
+            companyH = 25
+        }
         let imgArr = model.imgs.components(separatedBy: ",")
         var hang:Float = 1
         if imgArr.count > 0{
@@ -103,7 +118,7 @@ class CNLiveViateAwardModelLayout:NSObject{
         }
         var imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
         if isPreview == false{//获奖详情页
-            _awardModel?.cellH = Float(123)+descH+Float(hang*imgWH)+55
+            _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)+descH+Float(hang*imgWH)+55