简历设置里- 不显示的开关在简历里也不显示的逻辑

“张旭”
1 parent c65a958c
Showing 4 changed files with 32 additions and 12 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字简历相关页面/CNLiveDigitalResumePreViewController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/DigitalResume/CNLiveDigitalResumeCell.swift
metaCode/Classes/Main/Model/Vitae/CNLiveVitaeModel.swift
@@ -738,9 +738,9 @@
 				19DFE64C2C4792C500E428AE /* CNLiveDigitalResumeInfoController.swift */,
 				192ED4642C4DF6340057244C /* CNLiveDigitalResumeInfoSelectAddressController.swift */,
 				192ED4662C4F47E50057244C /* CNLiveSelectHangYeController.swift */,
-				1909DC952C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift */,
 				19CB631E2C69ADF500D889F8 /* CNLiveDigitalResumePreViewSelectRenzhengCerController.swift */,
 				19CB63252C6B2CD700D889F8 /* CNLiveDigitalResumePreViewMineJianJieController.swift */,
+				1909DC952C6309EC001E7986 /* CNLiveDigitalResumePreViewController.swift */,
 			);
 			path = "数字简历相关页面";
 			sourceTree = "<group>";
@@ -514,15 +514,19 @@ class CNLiveDigitalResumePreViewController:CNLiveBaseViewController,UITableViewD
                             self.workPreViewDataArray.add(newWorkModel)
                             self.awardPreViewDataArray.add(CNLiveViatePreviewCellType.work)
                         }
-                        for (_,mdl) in self.vitaeModel!.awards.enumerated() {
-                            self.totalDataArray.add(CNLiveViatePreviewCellType.award)
-                            self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.award)
-                            let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false)
-                            let newWorkModel = layout.getCellHModel()
-                            self.awardDataArray.add(newWorkModel)
-                            self.workDataArray.add(CNLiveViatePreviewCellType.award)
-                            self.awardPreViewDataArray.add(newWorkModel)
-                            self.workPreViewDataArray.add(CNLiveViatePreviewCellType.award)
+                        if self.vitaeModel!.vitae!.showAwards == true{
+                            for (_,mdl) in self.vitaeModel!.awards.enumerated() {
+                                self.totalDataArray.add(CNLiveViatePreviewCellType.award)
+                                self.totalPreViewDataArray.add(CNLiveViatePreviewCellType.award)
+                                let layout = CNLiveViateAwardModelLayout(model: mdl ,descH: Float(40.0),isPreview: true, isExpand: false)
+                                let newWorkModel = layout.getCellHModel()
+                                self.awardDataArray.add(newWorkModel)
+                                self.workDataArray.add(CNLiveViatePreviewCellType.award)
+                                self.awardPreViewDataArray.add(newWorkModel)
+                                self.workPreViewDataArray.add(CNLiveViatePreviewCellType.award)
+                            }
+                        }else{
+                            print("false")
                         }
                         self.totalDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
                         self.workDataArray.add(CNLiveViatePreviewCellType.mineJieShao)
@@ -425,7 +425,7 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile
         self.phoneTitleLabel.sizeToFit()
         self.phoneTitleLabel.snp.makeConstraints { make in
-            make.left.equalTo(adapt_length(length: 15))
+            make.left.equalTo(15)
             make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8))
             make.width.equalTo(self.phoneTitleLabel.size.width)
             make.height.equalTo(self.phoneTitleLabel.size.height)
@@ -769,7 +769,22 @@ class CNLiveDigitalResumeCell: UITableViewCell {
         let idNo = UserInfoManager.shared.userInfo.currentUser?.idNo ?? ""
         let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: idNo)
         let ageStr = String(format: "%d", age ?? 0)
-        self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile
+        var phoneTitleLabelStr = gender
+        if (model.vitae?.showAge ?? false) == true{
+            phoneTitleLabelStr = phoneTitleLabelStr+" | "+ageStr+"岁"
+        }
+        if (model.vitae?.showPhone ?? false) == true{
+            phoneTitleLabelStr = phoneTitleLabelStr+" | "+UserInfoManager.shared.userInfo.mobile
+        }
+
+        self.phoneTitleLabel.text = phoneTitleLabelStr
+        self.phoneTitleLabel.sizeToFit()
+        self.phoneTitleLabel.snp.remakeConstraints { make in
+            make.left.equalTo(15)
+            make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8))
+            make.width.equalTo(self.phoneTitleLabel.size.width)
+            make.height.equalTo(self.phoneTitleLabel.size.height)
+        }
         self.jianliTitleLabel.text = "数字简历ID："+"\(model.vitae!.id)"
         if model.vitae?.profession.count ?? 0 > 0{
@@ -41,6 +41,7 @@ class CNLiveVitaeVitaeModel:BaseModel{
     var workTime:String = ""
     ///
     var showAge:Bool = false
+    var showPhone:Bool = false
     ///
     var showAddress:Bool = false
     ///