Commit 43a0639e83e58ffb9cc3ec34d054bc795e7c5963
1 parent
c65a958c
简历设置里- 不显示的开关在简历里也不显示的逻辑
Showing
4 changed files
with
32 additions
and
12 deletions
metaCode.xcodeproj/project.pbxproj
| ... | ... | @@ -738,9 +738,9 @@ |
| 738 | 738 | 19DFE64C2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift */, |
| 739 | 739 | 192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */, |
| 740 | 740 | 192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */, |
| 741 | - 1909DC952C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift */, | |
| 742 | 741 | 19CB631E2C69ADF500D889F8 /* CNLiveDigitalResumePreViewSelectRenzhengCerController.swift */, |
| 743 | 742 | 19CB63252C6B2CD700D889F8 /* CNLiveDigitalResumePreViewMineJianJieController.swift */, |
| 743 | + 1909DC952C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift */, | |
| 744 | 744 | ); |
| 745 | 745 | path = "数字简历相关页面"; |
| 746 | 746 | sourceTree = "<group>"; | ... | ... |
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
| ... | ... | @@ -514,15 +514,19 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD |
| 514 | 514 | self.workPreViewDataArray.add(newWorkModel) |
| 515 | 515 | self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.work) |
| 516 | 516 | } |
| 517 | - for (_,mdl) in self.vitaeModel!.awards.enumerated() { | |
| 518 | - self.totalDataArray.add(CNLiveViatePreviewCellType.award) | |
| 519 | - self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.award) | |
| 520 | - let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false) | |
| 521 | - let newWorkModel = layout.getCellHModel() | |
| 522 | - self.awardDataArray.add(newWorkModel) | |
| 523 | - self.workDataArray.add(CNLiveViatePreviewCellType.award) | |
| 524 | - self.awardPreViewDataArray.add(newWorkModel) | |
| 525 | - self.workPreViewDataArray.add(CNLiveViatePreviewCellType.award) | |
| 517 | + if self.vitaeModel!.vitae!.showAwards == true{ | |
| 518 | + for (_,mdl) in self.vitaeModel!.awards.enumerated() { | |
| 519 | + self.totalDataArray.add(CNLiveViatePreviewCellType.award) | |
| 520 | + self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.award) | |
| 521 | + let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false) | |
| 522 | + let newWorkModel = layout.getCellHModel() | |
| 523 | + self.awardDataArray.add(newWorkModel) | |
| 524 | + self.workDataArray.add(CNLiveViatePreviewCellType.award) | |
| 525 | + self.awardPreViewDataArray.add(newWorkModel) | |
| 526 | + self.workPreViewDataArray.add(CNLiveViatePreviewCellType.award) | |
| 527 | + } | |
| 528 | + }else{ | |
| 529 | + print("false") | |
| 526 | 530 | } |
| 527 | 531 | self.totalDataArray.add(CNLiveViatePreviewCellType.mineJieShao) |
| 528 | 532 | self.workDataArray.add(CNLiveViatePreviewCellType.mineJieShao) | ... | ... |
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
| ... | ... | @@ -425,7 +425,7 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 425 | 425 | self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile |
| 426 | 426 | self.phoneTitleLabel.sizeToFit() |
| 427 | 427 | self.phoneTitleLabel.snp.makeConstraints { make in |
| 428 | - make.left.equalTo(adapt_length(length: 15)) | |
| 428 | + make.left.equalTo(15) | |
| 429 | 429 | make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8)) |
| 430 | 430 | make.width.equalTo(self.phoneTitleLabel.size.width) |
| 431 | 431 | make.height.equalTo(self.phoneTitleLabel.size.height) |
| ... | ... | @@ -769,7 +769,22 @@ class CNLiveDigitalResumeCell: UITableViewCell { |
| 769 | 769 | let idNo = UserInfoManager.shared.userInfo.currentUser?.idNo ?? "" |
| 770 | 770 | let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: idNo) |
| 771 | 771 | let ageStr = String(format: "%d", age ?? 0) |
| 772 | - self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile | |
| 772 | + var phoneTitleLabelStr = gender | |
| 773 | + if (model.vitae?.showAge ?? false) == true{ | |
| 774 | + phoneTitleLabelStr = phoneTitleLabelStr+" | "+ageStr+"岁" | |
| 775 | + } | |
| 776 | + if (model.vitae?.showPhone ?? false) == true{ | |
| 777 | + phoneTitleLabelStr = phoneTitleLabelStr+" | "+UserInfoManager.shared.userInfo.mobile | |
| 778 | + } | |
| 779 | + | |
| 780 | + self.phoneTitleLabel.text = phoneTitleLabelStr | |
| 781 | + self.phoneTitleLabel.sizeToFit() | |
| 782 | + self.phoneTitleLabel.snp.remakeConstraints { make in | |
| 783 | + make.left.equalTo(15) | |
| 784 | + make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8)) | |
| 785 | + make.width.equalTo(self.phoneTitleLabel.size.width) | |
| 786 | + make.height.equalTo(self.phoneTitleLabel.size.height) | |
| 787 | + } | |
| 773 | 788 | |
| 774 | 789 | self.jianliTitleLabel.text = "数字简历ID："+"\(model.vitae!.id)" |
| 775 | 790 | if model.vitae?.profession.count ?? 0 > 0{ | ... | ... |
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift