Skip to content

G
galaxy-iOS
Commit 3b3b761e authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

代码修改

parent f736ecfc
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 120 deletions
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHSearchInfomationVC.swift
View file @ 3b3b761e
......@@ -359,7 +359,7 @@ extension YHSearchInfomationVC: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
gurad let cell = tableView.dequeueReusableCell(withIdentifier: YHSearchInfoCell.cellReuseIdentifier, for: indexPath) as? YHSearchInfoCell else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHSearchInfoCell.cellReuseIdentifier, for: indexPath) as? YHSearchInfoCell else { return UITableViewCell() }
if 0 <= indexPath.section && indexPath.section < items.count {
let item = items[indexPath.section]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/FileList(文件清单)/C/YHGCMyFileListViewController.swift
View file @ 3b3b761e
......@@ -299,11 +299,11 @@ extension YHGCMyFileListViewController: UITableViewDelegate, UITableViewDataSour
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let noneCell = tableView.dequeueReusableCell(withIdentifier: YHMyFileListNoneCell.cellReuseIdentifier, for: indexPath) as! YHMyFileListNoneCell
guard let noneCell = tableView.dequeueReusableCell(withIdentifier: YHMyFileListNoneCell.cellReuseIdentifier, for: indexPath) as? YHMyFileListNoneCell else { return UITableViewCell() }
if 0 <= indexPath.section && indexPath.section < items.count {
let model = items[indexPath.section]
if model.supplement_list.count > 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: YHMyFileListCell.cellReuseIdentifier, for: indexPath) as! YHMyFileListCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHMyFileListCell.cellReuseIdentifier, for: indexPath) as? YHMyFileListCell else { return UITableViewCell() }
if 0 <= indexPath.row && indexPath.row < model.supplement_list.count {
cell.indexLabel.text = "\(indexPath.row+1)"
cell.model = model.supplement_list[indexPath.row]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCCertificateListVC.swift
View file @ 3b3b761e
......@@ -80,7 +80,7 @@ extension YHGCCertificateListVC: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath) as! YHCertificateInfoCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath) as? YHCertificateInfoCell else { return UITableViewCell() }
if 0 <= indexPath.section && indexPath.section < items.count {
let item = items[indexPath.section]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCCertificateSearchViewController.swift
View file @ 3b3b761e
......@@ -114,7 +114,7 @@ extension YHGCCertificateSearchViewController: UITableViewDelegate, UITableViewD
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath) as! YHCertificateInfoCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath) as? YHCertificateInfoCell else { return UITableViewCell() }
if 0 <= indexPath.section && indexPath.section < items.count {
let item = items[indexPath.section]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCCertificateUploadContentListVC.swift
View file @ 3b3b761e
......@@ -228,7 +228,7 @@ extension YHGCCertificateUploadContentListVC: UITableViewDelegate, UITableViewDa
if indexPath.section == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateTemplateCell.cellReuseIdentifier, for: indexPath) as! YHCertificateTemplateCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateTemplateCell.cellReuseIdentifier, for: indexPath) as? YHCertificateTemplateCell else { return UITableViewCell() }
cell.update(bottomMargin: 15)
if 0 <= indexPath.row && indexPath.row < templateArr.count {
cell.templatePath = templateArr[indexPath.row]
......@@ -236,7 +236,7 @@ extension YHGCCertificateUploadContentListVC: UITableViewDelegate, UITableViewDa
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateNameCell.cellReuseIdentifier, for: indexPath) as! YHCertificateNameCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateNameCell.cellReuseIdentifier, for: indexPath) as? YHCertificateNameCell else { return UITableViewCell() }
if 0 <= indexPath.row && indexPath.row < items.count {
let item = items[indexPath.row]
cell.updateModel(item)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/C/YHGCSignatureAddViewController.swift
View file @ 3b3b761e
......@@ -155,12 +155,12 @@ extension YHGCSignatureAddViewController: UITableViewDelegate, UITableViewDataSo
let message = data.message ?? ""
let isShow = data.isShowPrompts ?? false
if data.id == .id6 {
h = h + 72
h += 72
} else {
h = h + 52
h += 52
}
if isShow && message.count == 0 {
h = h + 20
h += 20
}
}
return CGFloat(h + 14)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/V/YHGCSignatureAddTableViewCell.swift
View file @ 3b3b761e
......@@ -73,7 +73,7 @@ class YHGCSignatureAddTableViewCell: UITableViewCell {
make.height.equalTo(1)
make.right.equalTo(-18)
}
y = y + 1
y += 1
let data = dataSource?.models?[i]
let isShow = data?.isShowPrompts ?? false
let message = data?.message ?? ""
......@@ -83,7 +83,7 @@ class YHGCSignatureAddTableViewCell: UITableViewCell {
h = 71
}
if isShow && message.count == 0 {
h = h + 20
h += 20
}
let itemView = YHWorkExperienceItemView()
itemView.dataSource = data
......@@ -107,7 +107,7 @@ class YHGCSignatureAddTableViewCell: UITableViewCell {
make.height.equalTo(h)
make.right.equalTo(-18)
}
y = y + h
y += h
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/V/YHGCSignatureUploadTableViewCell.swift
View file @ 3b3b761e
......@@ -195,7 +195,7 @@ class YHGCSignatureUploadTableViewCell: UITableViewCell {
make.height.equalTo(1)
make.right.equalTo(-18)
}
y = y + 1
y += 1
let data = dataSource.signedDocument[i]
let h = 70
let itemView = YHDocumentFileItemView()
......@@ -215,7 +215,7 @@ class YHGCSignatureUploadTableViewCell: UITableViewCell {
make.height.equalTo(h)
make.right.equalTo(-18)
}
y = y + h
y += h
}
updateAddView()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHGCCollegeSearchViewController.swift
View file @ 3b3b761e
......@@ -128,7 +128,7 @@ extension YHGCCollegeSearchViewController: UITableViewDelegate, UITableViewDataS
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: YHCollegeNameCell.cellReuseIdentifier, for: indexPath) as! YHCollegeNameCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHCollegeNameCell.cellReuseIdentifier, for: indexPath) as? YHCollegeNameCell else { return UITableViewCell() }
if indexPath.row < colleges.count {
let college: YHCollegeInfo = colleges[indexPath.row]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHGCEducationDetailVC.swift
View file @ 3b3b761e
......@@ -198,18 +198,18 @@ extension YHGCEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
if item is YHFormTitleItem { // 是标题
let formItem = item as! YHFormTitleItem
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let formItem = item as? YHFormTitleItem else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
cell.setTitleAndSubTitle(title: formItem.getTitle())
return cell
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return UITableViewCell() }
let cellType = getCellType(detailItem)
if cellType == .inputText {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as? YHFormItemInputTextCell else { return UITableViewCell() }
var isValueValid = false
if let value = detailItem.value, !value.isEmpty {
isValueValid = true
......@@ -270,7 +270,7 @@ extension YHGCEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
return cell
} else if cellType == .selectSheet {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.isShowTipsButton = (detailItem.type == .degreeType)
cell.tipsBtnClickBlock = {
YHWholeScreenTipsView.show(type: .degreeType, targetView: cell.tipsButton)
......@@ -288,7 +288,7 @@ extension YHGCEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
} else if cellType == .cerUpload {
let cell = tableView.dequeueReusableCell(withIdentifier: YHGCEducationCerUploadCell.cellReuseIdentifier, for: indexPath) as! YHGCEducationCerUploadCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHGCEducationCerUploadCell.cellReuseIdentifier, for: indexPath) as? YHGCEducationCerUploadCell else { return UITableViewCell() }
return cell
}
}
......@@ -329,7 +329,7 @@ extension YHGCEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
return
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return }
if detailItem.type == .universityFullName { // 选择大学名称
if detailInfo.degree.contains("学士学位") {
......@@ -540,7 +540,7 @@ extension YHGCEducationDetailVC: UITableViewDelegate, UITableViewDataSource {
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return .defaultType }
if detailItem.type == .cerUpload {
return .cerUpload
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHGCEducationInfoListVC.swift
View file @ 3b3b761e
......@@ -191,9 +191,9 @@ extension YHGCEducationInfoListVC: UITableViewDelegate, UITableViewDataSource {
if item is YHFormTitleItem { // 是标题
let formItem = item as! YHFormTitleItem
guard let formItem = item as? YHFormTitleItem else { return UITableViewCell() }
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
let isNeedWrap = (formItem.type == .mainApplicantProfessionalQualification)
var title = formItem.getTitle()
var subTitle = formItem.getSubTitle()
......@@ -238,8 +238,8 @@ extension YHGCEducationInfoListVC: UITableViewDelegate, UITableViewDataSource {
}
if item is YHFormAddItem {
let detailItem = item as! YHFormAddItem
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as! YHFormItemAddCell
guard let detailItem = item as? YHFormAddItem else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as? YHFormItemAddCell else { return UITableViewCell() }
if detailItem.type == .addEducation {
cell.title = "新增学历信息"
......@@ -272,8 +272,8 @@ extension YHGCEducationInfoListVC: UITableViewDelegate, UITableViewDataSource {
if item is YHQuestionInfo {
let detailItem = item as! YHQuestionInfo
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
guard let detailItem = item as? YHQuestionInfo else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as? YHFormItemQuestionsCell else { return UITableViewCell() }
cell.isMust = true
cell.title = String(format: "%d、\(detailItem.question)", indexPath.row)
......@@ -312,7 +312,7 @@ extension YHGCEducationInfoListVC: UITableViewDelegate, UITableViewDataSource {
let eduInfo: YHEducationInfo = eduList[indexPath.row-1]
if eduInfo.vacantNum > 0 { // 有未填项
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as? YHFormItemEnterDetailCell else { return UITableViewCell() }
if let college = eduInfo.college, !college.isEmpty {
cell.title = eduInfo.college
} else {
......@@ -339,7 +339,7 @@ extension YHGCEducationInfoListVC: UITableViewDelegate, UITableViewDataSource {
} else { // 数据已填满
let cell = tableView.dequeueReusableCell(withIdentifier: YHEducationInfoCell.cellReuseIdentifier, for: indexPath) as! YHEducationInfoCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHEducationInfoCell.cellReuseIdentifier, for: indexPath) as? YHEducationInfoCell else { return UITableViewCell() }
cell.titleLabel.text = eduInfo.college
cell.subTitleLabel.text = ""
let degree = eduInfo.getDegree()
......@@ -372,7 +372,7 @@ extension YHGCEducationInfoListVC: UITableViewDelegate, UITableViewDataSource {
if let quaList = educationInfo?.quaList, quaList.count > 0 {
// 第一行是标题
let quaInfo: YHQualificationInfo = quaList[indexPath.row-1]
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as? YHFormItemEnterDetailCell else { return UITableViewCell() }
cell.title = "证书标题"
if let qualification = quaInfo.qualification, !qualification.isEmpty {
cell.title = qualification
......@@ -459,7 +459,7 @@ extension YHGCEducationInfoListVC: UITableViewDelegate, UITableViewDataSource {
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return }
if detailItem.type == .educationInfo { // 学历
let vc = YHGCEducationDetailVC()
if let eduList = educationInfo?.eduList, indexPath.row-1 < eduList.count {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHGCQualificationDetailVC.swift
View file @ 3b3b761e
......@@ -153,18 +153,18 @@ extension YHGCQualificationDetailVC: UITableViewDelegate, UITableViewDataSource
let item: YHFormItemProtocol = arr[indexPath.row]
if item is YHFormTitleItem { // 是标题
let formItem = item as! YHFormTitleItem
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let formItem = item as? YHFormTitleItem else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
cell.setTitleAndSubTitle(title: formItem.getTitle())
return cell
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return UITableViewCell() }
let cellType = getCellType(detailItem)
if cellType == .inputText {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as? YHFormItemInputTextCell else { return UITableViewCell() }
var isValueValid = false
if let value = detailItem.value, !value.isEmpty {
isValueValid = true
......@@ -219,7 +219,7 @@ extension YHGCQualificationDetailVC: UITableViewDelegate, UITableViewDataSource
} else if cellType == .selectSheet {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.placeHolder = detailItem.placeHolder
var isValueValid = false
if let value = detailItem.value, !value.isEmpty {
......@@ -269,7 +269,7 @@ extension YHGCQualificationDetailVC: UITableViewDelegate, UITableViewDataSource
return
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return }
if detailItem.type == .qualificationCertificateName { // 资格证书名称
......@@ -367,7 +367,7 @@ extension YHGCQualificationDetailVC: UITableViewDelegate, UITableViewDataSource
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return .defaultType }
if detailItem.type == .conferCity {
if detailInfo.isCollegeInAboard() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Certificates(证书上传和证书信息)/YHGCCertificateInfoController.swift
View file @ 3b3b761e
......@@ -227,8 +227,8 @@ extension YHGCCertificateInfoController: UITableViewDelegate, UITableViewDataSou
let item: YHFormItemProtocol = arr[indexPath.row]
if item is YHFormTitleItem { // 标题
let titleItem = item as! YHFormTitleItem
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let titleItem = item as? YHFormTitleItem else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
// var isNeedText = ""
// if titleItem.type == .chinaIdCardInfo {
......@@ -261,11 +261,11 @@ extension YHGCCertificateInfoController: UITableViewDelegate, UITableViewDataSou
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
let title = arr[0] as! YHFormTitleItem
guard let detailItem = item as? YHFormDetailItem else { return UITableViewCell() }
guard let title = arr[0] as? YHFormTitleItem else { return UITableViewCell() }
if detailItem.type == .chinaIdentityCardNumber || detailItem.type == .certificateSignPlace || detailItem.type == .traverlPassportNumber || detailItem.type == .certificateNumber { // 证件号码和签发地需要填写
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as? YHFormItemInputTextCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.placeHolder = detailItem.placeHolder
cell.title = detailItem.getTitle()
......@@ -331,7 +331,7 @@ extension YHGCCertificateInfoController: UITableViewDelegate, UITableViewDataSou
if detailItem.type == .certificateType || detailItem.type == .certificateSignDate {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.detail = detailItem.value
......@@ -342,7 +342,7 @@ extension YHGCCertificateInfoController: UITableViewDelegate, UITableViewDataSou
if detailItem.type == .certificateValidDate { // 届满日期
if title.type == .chinaIdCardInfo { // 身份证
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemExpireDateCell.cellReuseIdentifier, for: indexPath) as! YHFormItemExpireDateCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemExpireDateCell.cellReuseIdentifier, for: indexPath) as? YHFormItemExpireDateCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.detail = (detailItem.value == YHCNIdentityCard.longTime ? "" : detailItem.value)
......@@ -362,7 +362,7 @@ extension YHGCCertificateInfoController: UITableViewDelegate, UITableViewDataSou
}
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.detail = detailItem.value
......@@ -419,8 +419,8 @@ extension YHGCCertificateInfoController: UITableViewDelegate, UITableViewDataSou
return
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
let titleItem = arr[0] as! YHFormTitleItem
guard let detailItem = item as? YHFormDetailItem else { return }
guard let titleItem = arr[0] as? YHFormTitleItem else { return }
if detailItem.type == .certificateValidDate ||
detailItem.type == .certificateSignDate { // 届满日期 签发日期
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Child(子女)/YHGCChildBasicInfoVC.swift
View file @ 3b3b761e
......@@ -181,7 +181,7 @@ class YHGCChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return .defaultType }
if detailItem.type == .birthCity {
return .inputText
......@@ -250,16 +250,16 @@ extension YHGCChildBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
let cellType = getCellType(item)
if cellType == .title { // 标题
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
cell.setTitleAndSubTitle(title: item.getTitle())
return cell
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return UITableViewCell() }
if cellType == .inputText { // 输入文字cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as? YHFormItemInputTextCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.placeHolder = detailItem.placeHolder
cell.title = detailItem.getTitle()
......@@ -351,7 +351,7 @@ extension YHGCChildBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
}
if cellType == .selectSheet { // 点击选择列表cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.placeHolder = detailItem.placeHolder
cell.title = detailItem.getTitle()
......@@ -362,7 +362,7 @@ extension YHGCChildBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
if cellType == .twoChoice { // 双项选择cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as? YHFormItemDoubleChoiceCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = item.getTitle()
cell.answerArr = nil
......@@ -465,7 +465,7 @@ extension YHGCChildBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
let item = arr[indexPath.row]
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return }
if detailItem.type == .stayHKDate { // 出生日期/获准滞留至
var title = ""
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Child(子女)/YHGCChildPrimaryInfoVC.swift
View file @ 3b3b761e
......@@ -177,7 +177,7 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return .defaultType }
if detailItem.type == .birthCity {
var isBirthOverSeas = false
......@@ -235,19 +235,19 @@ extension YHGCChildPrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
let item: YHFormItemProtocol = arr[indexPath.row]
if item is YHFormTitleItem { // 标题
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
cell.setTitleAndSubTitle(title: item.getTitle())
return cell
} else if item is YHFormDetailItem { // 具体信息
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return UITableViewCell() }
let cellType = self.getCellType(detailItem)
if cellType == .twoChoice {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as? YHFormItemDoubleChoiceCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.enableEdit = true
......@@ -340,7 +340,7 @@ extension YHGCChildPrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
} else if cellType == .selectSheet { // 选择列表面板
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.detail = detailItem.value
......@@ -348,7 +348,7 @@ extension YHGCChildPrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
return cell
} else if cellType == .inputText { // 输入文字cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as? YHFormItemInputTextCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.placeHolder = detailItem.placeHolder
cell.title = detailItem.getTitle()
......@@ -432,14 +432,14 @@ extension YHGCChildPrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
let item = arr[indexPath.row]
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return }
// 选国籍/现居住城市/详细地址
if detailItem.type == .nationOrArea {
let vc = YHSelectCountryViewController()
vc.backLocationStringController = {
[weak self] country in
guard let self = self else { return }
let title = arr[0] as! YHFormTitleItem
guard let title = arr[0] as? YHFormTitleItem else { return }
if title.type == .F { // 选国籍
self.child?.nationality = country
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Spouse(配偶)/YHGCSpouseBasicInfoVC.swift
View file @ 3b3b761e
......@@ -284,7 +284,7 @@ class YHGCSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
return .addItem
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return .defaultType }
if detailItem.type == .birthCity {
return .inputText
......@@ -351,13 +351,13 @@ extension YHGCSpouseBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
let cellType = getCellType(item)
if cellType == .title { // 标题
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
cell.setTitleAndSubTitle(title: item.getTitle())
return cell
}
if cellType == .addItem { // 新增item cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as! YHFormItemAddCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as? YHFormItemAddCell else { return UITableViewCell() }
cell.title = item.getTitle()
cell.clickBlock = {
[weak self] in
......@@ -370,10 +370,10 @@ extension YHGCSpouseBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return UITableViewCell() }
if cellType == .inputText { // 输入文字cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as? YHFormItemInputTextCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.placeHolder = detailItem.placeHolder
cell.title = detailItem.getTitle()
......@@ -464,7 +464,7 @@ extension YHGCSpouseBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
}
if cellType == .selectSheet { // 点击选择列表cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.placeHolder = detailItem.placeHolder
cell.title = detailItem.getTitle()
......@@ -476,7 +476,7 @@ extension YHGCSpouseBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
if cellType == .twoChoice { // 双项选择cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as? YHFormItemDoubleChoiceCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = item.getTitle()
......@@ -530,7 +530,7 @@ extension YHGCSpouseBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
if cellType == .degreeDetailInfo { // 学位cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDegreeInfoCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDegreeInfoCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDegreeInfoCell.cellReuseIdentifier, for: indexPath) as? YHFormItemDegreeInfoCell else { return UITableViewCell() }
if let degreeArr = self.spouse?.hasDegreeJson {
if indexPath.row-2 < degreeArr.count {
......@@ -645,7 +645,7 @@ extension YHGCSpouseBasicInfoVC: UITableViewDelegate, UITableViewDataSource {
let item = arr[indexPath.row]
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return }
if detailItem.type == .birthday || detailItem.type == .stayHKDate { // 出生日期/获准滞留至
var title = ""
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Spouse(配偶)/YHGCSpousePrimaryInfoVC.swift
View file @ 3b3b761e
......@@ -186,13 +186,13 @@ extension YHGCSpousePrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
let item: YHFormItemProtocol = arr[indexPath.row]
if item is YHFormTitleItem { // 标题
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
cell.setTitleAndSubTitle(title: item.getTitle())
return cell
} else if item is YHFormDetailItem { // 具体信息
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return UITableViewCell() }
if detailItem.type == .isAccompanyToHK ||
detailItem.type == .isHandleHKPassPort ||
......@@ -200,7 +200,7 @@ extension YHGCSpousePrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
detailItem.type == .isLiveOverSeasMore1Year ||
detailItem.type == .permanentResidenceStatus {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as? YHFormItemDoubleChoiceCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
......@@ -274,10 +274,6 @@ extension YHGCSpousePrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
self.spouse?.setOverSearsOver1Year(option)
self.loadInfo()
} else if detailItem.type == .isLiveOverSeasMore1Year {
self.spouse?.setOverSearsOver1Year(option)
self.loadInfo()
} else if detailItem.type == .permanentResidenceStatus {
self.spouse?.setHavePermanentResidenceStatus(option)
self.loadInfo()
......@@ -290,7 +286,7 @@ extension YHGCSpousePrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
if detailItem.type == .nationOrArea || detailItem.type == .liveCity {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as? YHFormItemSelectSheetCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.placeHolder = detailItem.placeHolder
......@@ -300,7 +296,7 @@ extension YHGCSpousePrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
}
if detailItem.type == .detailAddress {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as? YHFormItemInputTextCell else { return UITableViewCell() }
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
cell.text = detailItem.value
......@@ -386,13 +382,13 @@ extension YHGCSpousePrimaryInfoVC: UITableViewDelegate, UITableViewDataSource {
let item = arr[indexPath.row]
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
guard let detailItem = item as? YHFormDetailItem else { return }
if detailItem.type == .nationOrArea {
let vc = YHSelectCountryViewController()
vc.backLocationStringController = {
[weak self] country in
guard let self = self else { return }
let title = arr[0] as! YHFormTitleItem
guard let title = arr[0] as? YHFormTitleItem else { return }
if title.type == .F {
self.spouse?.nationality = country
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift
View file @ 3b3b761e
......@@ -331,10 +331,10 @@ extension YHGCFamilyMemberInfoListVC: UITableViewDelegate, UITableViewDataSource
if item is YHFormTitleItem { // 是标题
let formItem = item as! YHFormTitleItem
guard let formItem = item as? YHFormTitleItem else { return UITableViewCell() }
// 配偶父母子女兄妹title
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as? YHFormItemTitleCell else { return UITableViewCell() }
cell.setTitleAndSubTitle(title: formItem.getTitle(), subTitle: formItem.getSubTitle())
// 决定右边按钮显示样式
......@@ -374,8 +374,8 @@ extension YHGCFamilyMemberInfoListVC: UITableViewDelegate, UITableViewDataSource
// 配偶父母子女兄妹具体条目
if item is YHFamilyMember {
let detailItem = item as! YHFamilyMember
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
guard let detailItem = item as? YHFamilyMember else { return UITableViewCell() }
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as? YHFormItemEnterDetailCell else { return UITableViewCell() }
cell.isNeedTopLineNoGap = (indexPath.row == 1)
cell.title = detailItem.getTitle()
// cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNumber != 0 ? .failColor : .labelTextColor2)
......@@ -494,10 +494,10 @@ extension YHGCFamilyMemberInfoListVC: UITableViewDelegate, UITableViewDataSource
// 新增子女/兄弟姐妹
if item is YHFormAddItem {
let formItem = item as! YHFormAddItem
guard let formItem = item as? YHFormAddItem else { return UITableViewCell() }
if formItem.type == .addChild || formItem.type == .addBrother {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as! YHFormItemAddCell
guard let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as? YHFormItemAddCell else { return UITableViewCell() }
cell.title = formItem.getTitle()
cell.isNeedTopLineNoGap = true
......@@ -577,7 +577,7 @@ extension YHGCFamilyMemberInfoListVC: UITableViewDelegate, UITableViewDataSource
}
// 新增子女兄妹
if item is YHFormAddItem {
let detailItem = item as! YHFormAddItem
guard let detailItem = item as? YHFormAddItem else { return }
if detailItem.type == .addChild {
} else if detailItem.type == .addBrother {
......@@ -587,7 +587,7 @@ extension YHGCFamilyMemberInfoListVC: UITableViewDelegate, UITableViewDataSource
}
if item is YHFamilyMember {
let detailItem = item as! YHFamilyMember
guard let detailItem = item as! YHFamilyMember else { return }
// 配偶
if detailItem.relationType == .spouse {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHGCMainApplicantInformationViewController.swift
View file @ 3b3b761e
......@@ -129,7 +129,7 @@ class YHGCMainApplicantInformationViewController: YHBaseViewController {
YHHUD.flash(message: error.errorMsg )
} else {
YHHUD.hideFlashMessage()
self.stepView.currentIndex = self.stepView.currentIndex + 1
self.stepView.currentIndex += 1
self.isShowPrompt = false
self.stepView.currentIndex = self.stepView.currentIndex
if self.stepView.currentIndex == 3 {
......@@ -227,13 +227,13 @@ extension YHGCMainApplicantInformationViewController: UITableViewDelegate, UITab
if isShow && message.count == 0 && isNeed {
h = h + 72 + 20
} else {
h = h + 72
h += 72
}
} else {
if isShow && message.count == 0 && isNeed {
h = h + 52 + 20
} else {
h = h + 52
h += 52
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHGCMainApplicantInformationViewModel.swift
View file @ 3b3b761e
......@@ -26,7 +26,7 @@ class YHGCMainApplicantInformationViewModel: YHBaseViewModel {
if string.count != 0 {
string = string + "/" + item
} else {
string = string + item
string += item
}
}
let item1 = YHItemModel(id: .id3, isNeed: true, title: "省市地区", isUserKeyBoard: false, prompts: "请选择", message: string, type: .address, isShowPrompts: isShowPrompt, alertMessage: "请选择省市地区")
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHGCWorkExperienceListViewController.swift
View file @ 3b3b761e
......@@ -233,9 +233,9 @@ extension YHGCWorkExperienceListViewController: UITableViewDelegate, UITableView
let data = array[i]
let message = data.message ?? ""
let isShow = data.isShowPrompts ?? false
h = h + 62
h += 62
if isShow && message.count == 0 {
h = h + 20
h += 20
}
}
return CGFloat(h + 52 + 14)
......@@ -258,9 +258,9 @@ extension YHGCWorkExperienceListViewController: UITableViewDelegate, UITableView
let data = array[i]
let message = data.message ?? ""
let isShow = data.isShowPrompts ?? false
h = h + 68
h += 68
if isShow && message.count == 0 {
h = h + 20
h += 20
}
}
return CGFloat(h + 52 + 96 + 14)
......@@ -275,7 +275,7 @@ extension YHGCWorkExperienceListViewController: UITableViewDelegate, UITableView
if let data = dataSource {
for item in data {
if item.company_name == "" {
height = height + 76
height += 76
} else {
let text = item.company_name // 要显示的文本内容
let font = UIFont.PFSC_B(ofSize: 14) // 字体大小
......@@ -288,13 +288,13 @@ extension YHGCWorkExperienceListViewController: UITableViewDelegate, UITableView
// 根据指定的最大宽度和字体大小计算文本的高度
let size = (text! as NSString).boundingRect(with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size
if size.height > 20 {
height = height + 96
height += 96
} else {
height = height + 76
height += 76
}
}
if showPrompt && item.vacant_num != 0 {
height = height + 20
height += 20
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHGCWorkExperienceViewController.swift
View file @ 3b3b761e
......@@ -154,12 +154,12 @@ extension YHGCWorkExperienceViewController: UITableViewDelegate, UITableViewData
let message = data.message ?? ""
let isShow = data.isShowPrompts ?? false
if data.id == .id6 {
h = h + 72
h += 72
} else {
h = h + 52
h += 52
}
if isShow && message.count == 0 {
h = h + 20
h += 20
}
}
return CGFloat(h + 52 + 14)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHGCWorkExperienceListTableViewCell.swift
View file @ 3b3b761e
......@@ -187,7 +187,7 @@ class YHGCWorkExperienceListTableViewCell: UITableViewCell {
make.height.equalTo(1)
make.right.equalTo(-18)
}
total = total + 1
total += 1
let itemView = YHWorkItemView()
itemView.clickBlock = {[weak self] model in
guard let self = self else { return }
......@@ -233,7 +233,7 @@ class YHGCWorkExperienceListTableViewCell: UITableViewCell {
make.height.equalTo(h)
make.right.equalTo(-18)
}
total = total + h
total += h
}
}
......@@ -241,7 +241,7 @@ class YHGCWorkExperienceListTableViewCell: UITableViewCell {
moreButton.isHidden = false
cannalButton.isHidden = true
for i in 0..<(dataSource?.count ?? 0) {
let view = mainItemView.viewWithTag(4000 + i) as! YHWorkItemView
guard let view = mainItemView.viewWithTag(4000 + i) as? YHWorkItemView else { return }
view.isShowDelete(i, isShow: false)
}
if let block = isMoreBlock {
......@@ -253,7 +253,7 @@ class YHGCWorkExperienceListTableViewCell: UITableViewCell {
moreButton.isHidden = true
cannalButton.isHidden = false
for i in 0..<(dataSource?.count ?? 0) {
let view = mainItemView.viewWithTag(4000 + i) as! YHWorkItemView
guard let view = mainItemView.viewWithTag(4000 + i) as? YHWorkItemView else { return }
view.isShowDelete(i, isShow: true)
}
if let block = isMoreBlock {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHGCWorkListHasDocTableViewCell.swift
View file @ 3b3b761e
......@@ -128,13 +128,13 @@ class YHGCWorkListHasDocTableViewCell: UITableViewCell {
make.right.equalTo(-18)
}
}
y = y + 1
y += 1
let data = dataSource?.models?[i]
let isShow = data?.isShowPrompts ?? false
let message = data?.message ?? ""
var h = 67
if isShow && message.count == 0 {
h = h + 20
h += 20
}
let itemView = YHWorkExperienceItemView()
itemView.companyList = companyList
......@@ -154,7 +154,7 @@ class YHGCWorkListHasDocTableViewCell: UITableViewCell {
make.height.equalTo(h)
make.right.equalTo(-18)
}
y = y + h
y += h
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHGCWorkListHasWorkExperienceTableViewCell.swift
View file @ 3b3b761e
......@@ -91,13 +91,13 @@ class YHGCWorkListHasWorkExperienceTableViewCell: UITableViewCell {
make.height.equalTo(1)
make.right.equalTo(-18)
}
y = y + 1
y += 1
let data = dataSource?.models?[i]
let isShow = data?.isShowPrompts ?? false
let message = data?.message ?? ""
var h = 61
if isShow && message.count == 0 {
h = h + 20
h += 20
}
let itemView = YHWorkExperienceItemView()
itemView.dataSource = data
......@@ -116,7 +116,7 @@ class YHGCWorkListHasWorkExperienceTableViewCell: UITableViewCell {
make.height.equalTo(h)
make.right.equalTo(-18)
}
y = y + h
y += h
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/VM/YHGCWorkExperienceViewModel.swift
View file @ 3b3b761e
......@@ -24,7 +24,7 @@ class YHGCWorkExperienceViewModel: YHBaseViewModel {
if string.count != 0 {
string = string + "/" + item
} else {
string = string + item
string += item
}
}
let item2 = YHWorkExperienceModel(id: .id3, isNeed: true, title: "工作城市", isUserKeyBoard: false, prompts: "请选择", message: string, type: .address, isShowPrompts: isShowPrompt, alertMessage: "请选择工作国家/地区")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment