iOS Team / CNLiveMateCode · Commits

Commit 1eb764bb799022563b8913a125b403285de379ca

Authored by “张旭”
1 parent d0102ac2

* [x] 新增工作记录和获奖情况--描述必填 

* [x] 工作记录desc 展开显示不全
Inline Side-by-side
Showing 3 changed files with 41 additions and 8 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
  View file @1eb764b
... ... @@ -299,7 +299,7 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
299 299 showMessage(message: "请选择结束时间")
300 300 return
301 301 }
302   - if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "获奖描述"{
  302 + if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "描述"{
303 303 showMessage(message: "请填写经历描述")
304 304 return
305 305 }
... ...
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
  View file @1eb764b
... ... @@ -306,7 +306,10 @@ class CNLiveVitaeWorkCell: UITableViewCell{
306 306 required init?(coder: NSCoder) {
307 307 fatalError("init(coder:) has not been implemented")
308 308 }
309   -
  309 + override func layoutSubviews() {
  310 + super.layoutSubviews()
  311 +
  312 + }
310 313 //获奖
311 314 func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
312 315 self.imagesTotalView.subviews.forEach { view in
... ... @@ -335,10 +338,15 @@ class CNLiveVitaeWorkCell: UITableViewCell{
335 338 self.expandBtn.isHidden = false
336 339 }
337 340  
  341 + jianjieLabel.numberOfLines = 0
  342 + jianjieLabel.width = self.whiteBgView.width-15-20
  343 + let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
  344 + self.jianjieLabel.sizeToFit()
  345 +
338 346 var jienjieH:CGFloat = 0
339 347 if model.isExpand{
340 348 //展开状态
341   - jienjieH = height*CGFloat(lines)
  349 + jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
342 350 self.jianjieLabel.numberOfLines = 0
343 351 }else{
344 352 //收起状态
... ... @@ -465,10 +473,15 @@ class CNLiveVitaeWorkCell: UITableViewCell{
465 473 self.expandBtn.isHidden = false
466 474 }
467 475  
  476 + jianjieLabel.numberOfLines = 0
  477 + jianjieLabel.width = self.whiteBgView.width-15-20
  478 + let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
  479 + self.jianjieLabel.sizeToFit()
  480 +
468 481 var jienjieH:CGFloat = 0
469 482 if model.isExpand{
470 483 //展开状态
471   - jienjieH = height*CGFloat(lines)
  484 + jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
472 485 self.jianjieLabel.numberOfLines = 0
473 486 }else{
474 487 //收起状态
... ... @@ -600,11 +613,16 @@ class CNLiveVitaeWorkCell: UITableViewCell{
600 613 button.isSelected = !button.isSelected
601 614 let lines = jianjieLabel.getRealLabelTextLines()
602 615 let height = jianjieLabel.qmui_lineHeight
  616 +
  617 + jianjieLabel.numberOfLines = 0
  618 + jianjieLabel.width = self.whiteBgView.width-15-20
  619 + let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
  620 + self.jianjieLabel.sizeToFit()
603 621  
604 622 var jienjieH:CGFloat = 0
605 623 if button.isSelected{
606 624 //文本收起状态,点击展开
607   - jienjieH = CGFloat(lines)*height
  625 + jienjieH = self.jianjieLabel.height//size.height//CGFloat(lines)*height
608 626 }else{
609 627 //文本展开状态,点击收起
610 628 jienjieH = 2*height+2
... ...
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourWorkAwardCell.swift
  View file @1eb764b
... ... @@ -304,10 +304,15 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
304 304 self.expandBtn.isHidden = false
305 305 }
306 306  
  307 + jianjieLabel.numberOfLines = 0
  308 + jianjieLabel.width = self.contentView.width-50-20
  309 + let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
  310 + self.jianjieLabel.sizeToFit()
  311 +
307 312 var jienjieH:CGFloat = 0
308 313 if model.isExpand{
309 314 //展开状态
310   - jienjieH = height*CGFloat(lines)
  315 + jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
311 316 self.jianjieLabel.numberOfLines = 0
312 317 }else{
313 318 //收起状态
... ... @@ -457,10 +462,15 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
457 462 self.expandBtn.isHidden = false
458 463 }
459 464  
  465 + jianjieLabel.numberOfLines = 0
  466 + jianjieLabel.width = self.contentView.width-50-20
  467 + let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
  468 + self.jianjieLabel.sizeToFit()
  469 +
460 470 var jienjieH:CGFloat = 0
461 471 if model.isExpand{
462 472 //展开状态
463   - jienjieH = height*CGFloat(lines)
  473 + jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
464 474 self.jianjieLabel.numberOfLines = 0
465 475 }else{
466 476 //收起状态
... ... @@ -567,10 +577,15 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
567 577 let lines = jianjieLabel.getRealLabelTextLines()
568 578 let height = jianjieLabel.qmui_lineHeight
569 579  
  580 + jianjieLabel.numberOfLines = 0
  581 + jianjieLabel.width = self.contentView.width-50-20
  582 + let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
  583 + self.jianjieLabel.sizeToFit()
  584 +
570 585 var jienjieH:CGFloat = 0
571 586 if button.isSelected{
572 587 //文本收起状态,点击展开
573   - jienjieH = CGFloat(lines)*height
  588 + jienjieH = self.jianjieLabel.height//size.height//CGFloat(lines)*height
574 589 }else{
575 590 //文本展开状态,点击收起
576 591 jienjieH = 2*height+2
... ...