1.1.2.24.08.24.15测试版

* [x] 工作记录列表页-展开收起有问题 * [x] 获奖记录列表页-展开收起有问题 * [x] 获奖记录列表页-布局有问题 * [x] 获奖记录列表页-编辑-新增获奖情况-获奖名称没有 * [x] 获奖记录列表-编辑-跳转的新增工作记录

1.1.2.24.08.24.15测试版
* [x] 工作记录列表页-展开收起有问题 * [x] 获奖记录列表页-展开收起有问题 * [x] 获奖记录列表页-布局有问题 * [x] 获奖记录列表页-编辑-新增获奖情况-获奖名称没有 * [x] 获奖记录列表-编辑-跳转的新增工作记录
“张旭”
1 parent 667675c0
Showing 7 changed files with 91 additions and 26 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkFirCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourWorkAwardCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewSixCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveViateWorkModelLayout.swift
@@ -2632,7 +2632,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.2.24.08.14.14;
+				CURRENT_PROJECT_VERSION = 1.1.2.24.08.24.15;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -2888,7 +2888,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.2.24.08.14.14;
+				CURRENT_PROJECT_VERSION = 1.1.2.24.08.24.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -156,15 +156,15 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 return cell
             }
             if self.workAwardType == .work{
+                cell.workAwardType = .work
                 if self.workModel != nil{
                     cell.workModel = self.workModel!
                 }
-                cell.workAwardType = .work
             }else{
+                cell.workAwardType = .award
                 if self.awardModel != nil{
                     cell.awardModel = self.awardModel!
                 }
-                cell.workAwardType = .award
             }
             return cell
@@ -506,7 +506,7 @@ class CNLiveVitaeAddWorkFirCell:UITableViewCell, UITextFieldDelegate{
     //获奖
     func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
-        self.weizhiRightTitleLabel.text = model.title
+        self.phoneTextFiled.text = model.title
         self.banfaTextFiled.text = model.company
         let startStr = self.convertMillisecondsStringToDateString(millisecondsString: model.time)
@@ -220,7 +220,13 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         }
         self.whiteBgView.addSubview(self.jianjieLabel)
-        self.whiteBgView.addSubview(self.expandBtn)
+        self.jianjieLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(10)
+            make.left.equalTo(self.workPositionTitleLabel.snp.left)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(40)
+        }
+
         let lines = jianjieLabel.getRealLabelTextLines()
         if lines <= 2{
@@ -236,7 +242,14 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             make.width.equalToSuperview()
             make.top.equalTo(self.jianjieLabel.snp.bottom).offset(10)
         }
-
+        self.whiteBgView.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.whiteBgView.addSubview(self.dingweiImgView)
         self.dingweiImgView.snp.makeConstraints { make in
             make.left.equalTo(15)
@@ -312,20 +325,40 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             self.expandBtn.isHidden = false
         }
-        if self.expandBtn.isSelected{
+        var jienjieH:CGFloat = 0
+        if model.isExpand{
             //展开状态
-            self.jianjieLabel.height = height*CGFloat(lines)
-
+            jienjieH = height*CGFloat(lines)
+            self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
             if lines <= 2{
                 //小于2行,按实际行数
-                self.jianjieLabel.height = CGFloat(lines)*height
+                jienjieH = CGFloat(lines)*height
+                self.jianjieLabel.numberOfLines = 1
             }else{
                 //大于2行, 显示2行
-                self.jianjieLabel.height = 2*height
+                jienjieH = 2*height+2
+                self.jianjieLabel.numberOfLines = 2
+            }
+        }
+        self.expandBtn.isSelected = model.isExpand
+        if model.company.count > 0{
+            self.jianjieLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(10)
+                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-20)
+                make.height.equalTo(jienjieH)
+            }
+        }else{
+            self.jianjieLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(10)
+                make.left.equalTo(self.workNameTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-20)
+                make.height.equalTo(jienjieH)
             }
         }
+        self.expandBtn.top = self.jianjieLabel.top+jienjieH
         self.editImageUrls.removeAll()
         self.editVideoUrl = ""
@@ -408,6 +441,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             self.workPositionTitleLabel.isHidden = true
             self.jianjieLabel.top = 113 - 25
         }
+ 
         self.jianjieLabel.text = model.jobDuties//"描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述"
         let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
@@ -417,20 +451,41 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             self.expandBtn.isHidden = false
         }
-        if self.expandBtn.isSelected{
+        var jienjieH:CGFloat = 0
+        if model.isExpand{
             //展开状态
-            self.jianjieLabel.height = height*CGFloat(lines)
-
+            jienjieH = height*CGFloat(lines)
+            self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
             if lines <= 2{
                 //小于2行,按实际行数
-                self.jianjieLabel.height = CGFloat(lines)*height
+                jienjieH = CGFloat(lines)*height
+                self.jianjieLabel.numberOfLines = 1
             }else{
                 //大于2行, 显示2行
-                self.jianjieLabel.height = 2*height
+                jienjieH = 2*height+2
+                self.jianjieLabel.numberOfLines = 2
             }
         }
+        self.expandBtn.isSelected = model.isExpand
+        if model.companyName.count > 0{
+            self.jianjieLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(10)
+                make.left.equalTo(self.workPositionTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-20)
+                make.height.equalTo(jienjieH)
+            }
+        }else{
+            self.jianjieLabel.snp.remakeConstraints { make in
+                make.top.equalTo(self.workNameTitleLabel.snp.bottom).offset(10)
+                make.left.equalTo(self.workNameTitleLabel.snp.left)
+                make.right.equalToSuperview().offset(-20)
+                make.height.equalTo(jienjieH)
+            }
+        }
+        self.expandBtn.top = self.jianjieLabel.top+jienjieH
+        
         self.editImageUrls.removeAll()
         self.editVideoUrl = ""
@@ -528,25 +583,35 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
+        var jienjieH:CGFloat = 0
         if button.isSelected{
             //文本收起状态,点击展开
-            self.jianjieLabel.height = CGFloat(lines)*height
+            jienjieH = CGFloat(lines)*height
         }else{
             //文本展开状态,点击收起
-            self.jianjieLabel.height = 2*height
+            jienjieH = 2*height+2
         }
-        self.vitaeWorkCellChangedBlock!(self, self.jianjieLabel.height, button.isSelected)
+        self.jianjieLabel.snp.remakeConstraints { make in
+            make.top.equalTo(self.workPositionTitleLabel.snp.bottom).offset(10)
+            make.left.equalTo(self.workPositionTitleLabel.snp.left)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(jienjieH)
+        }
+        
+        self.vitaeWorkCellChangedBlock!(self, jienjieH, button.isSelected)
-        self.expandBtn.top = self.jianjieLabel.bottom
+        self.expandBtn.top = self.jianjieLabel.top + jienjieH
     }
     @objc func editBtnAction(){
         let vc = CNLiveVitaeAddWorkController()
         if self.workModel != nil{
             vc.workModel = self.workModel
+            vc.workAwardType = .work
         }
         if self.awardModel != nil{
             vc.awardModel = self.awardModel
+            vc.workAwardType = .award
         }
         vc.seleArr = self.editImageUrls
         vc.seleVideoUrl = self.editVideoUrl
@@ -329,7 +329,7 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             make.height.equalTo(jienjieH)
         }
         self.expandBtn.top = self.jianjieLabel.top+jienjieH
-        
+
         let imgArr =  model.imgs.components(separatedBy: ",")
         if imgArr.count > 0{
             for i in 0..<imgArr.count {
@@ -205,7 +205,7 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
             var jienjieH:CGFloat = 0
             if model.vitae!.isExpand{
                 //展开状态
-                jienjieH = height*CGFloat(lines)
+                jienjieH = height*CGFloat(lines)+2
                 self.jianjieLabel.numberOfLines = 0
             }else{
                 //收起状态
@@ -239,7 +239,7 @@ class CNLiveDigitalResumePreviewSixCell: UITableViewCell {
         var jienjieH:CGFloat = 0
         if button.isSelected{
             //文本收起状态,点击展开
-            jienjieH = CGFloat(lines)*height
+            jienjieH = CGFloat(lines)*height+2
         }else{
             //文本展开状态,点击收起
             jienjieH = 2*height+2
@@ -60,7 +60,7 @@ class CNLiveViateWorkModelLayout:NSObject{
             cityH = 35
         }
         if isPreview == false{//工作记录详情页
-            _workModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+cityH+55
+            _workModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+cityH+55+15
         }else{//预览工作记录
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
             _workModel?.cellH = Float(162-58-25)+companyH+descH+Float(hang*imgWH)+cityH//+55
@@ -118,7 +118,7 @@ class CNLiveViateAwardModelLayout:NSObject{
         }
         var imgWH:Float = Float((KSreenWidth-60-15)/3.0+10)
         if isPreview == false{//获奖详情页
-            _awardModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+55
+            _awardModel?.cellH = Float(123-25)+companyH+descH+Float(hang*imgWH)+55+15
         }else{//预览获奖
             imgWH = Float((Float(KSreenWidth)-30-40-50)/3.0+10)
             _awardModel?.cellH = Float(162-58-25-25)+companyH+descH+Float(hang*imgWH)//+55