Skip to content

G
galaxy-iOS
Commit 897dde1e authored by DavidHuang's avatar DavidHuang
Browse files
Options

Merge branch 'qmas-1130' into yinhe-live-1212

parents 82e140ce d65a36d6
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 18 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 897dde1e
......@@ -6944,7 +6944,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7086,7 +7086,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7291,7 +7291,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7338,7 +7338,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 13;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift
View file @ 897dde1e
......@@ -502,7 +502,7 @@ extension YHHKPlanItemView : UITextViewDelegate {
guard let model = dataMode else { return }
guard let text = textView.text else { return }
var txtNum : Int = calcTextLength(string: text)
let txtNum : Int = calcTextLength(string: text)
numberLabel.text = txtNum.string + "/\(maxNumbler)"
model.content = text
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordViewController.swift
View file @ 897dde1e
......@@ -167,7 +167,7 @@ extension YHIncomeRecordViewController {
private func setupData() {
let detail: ASAttributedString = .init(string: "备注：全年收入是指应课税（应纳所得税）的就业或业务收入，包括工资薪金、津贴、股票期权及从其拥有的公司所得的利润。由个人投资所产生的收入不会计算在内。", .font(UIFont.PFSC_R(ofSize: 13)), .foreground(UIColor(hexString: "#8993A2") ?? .gray))
let firstSection: [TableRow] = [.consentForHKTravel("收入情况", detail, "您在前一年，全年收入是否达港币100万元或以上")]
let firstSection: [TableRow] = [.consentForHKTravel("收入情况", detail, "您在近十二个月，总收入是否达到港币100万元或以上")]
guard incomeModel.income_over_100 == YHIncomeOver100.true.rawValue else {
datas = [firstSection]
tableView.reloadData()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift
View file @ 897dde1e
......@@ -116,6 +116,15 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
return [section, section1]
} else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
return [section, section2]
} else if nationality.contains("中国") {
if is_live_oversea_year == 1 {
if mainModel.is_handled == 1 {
return [section1, section2]
}
return [section2]
} else {
return [section1]
}
} else {
return [section2]
}
......@@ -340,6 +349,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
mainModel.address.foreign = item.message ?? ""
case .id33:
mainModel.is_live_oversea_year = item.value?.first?.int ?? 0
mainModel.is_handled = 0
case .id34:
mainModel.birth_place.foreign = item.message ?? ""
case .id35:
......@@ -640,6 +650,19 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
guard passport_issue_at.count > 0 else { return false }
guard passport_issue_date_start_at.count > 0 else { return false }
guard passport_issue_date_end_at.count > 0 else { return false }
} else if nationality.contains("中国") {
if is_live_oversea_year == 1 {
guard passport_number.count > 0 else { return false }
guard passport_issue_at.count > 0 else { return false }
guard passport_issue_date_start_at.count > 0 else { return false }
guard passport_issue_date_end_at.count > 0 else { return false }
}
if mainModel.is_handled == 1 {
guard hk_macao_pass_number.count > 0 else { return false }
guard hk_macao_pass_issue_at.count > 0 else { return false }
guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
}
} else {
guard passport_number.count > 0 else { return false }
guard passport_issue_at.count > 0 else { return false }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift
View file @ 897dde1e
......@@ -35,10 +35,25 @@ class YHPreviewFamilyMemberViewController: YHPreviewBaseViewController {
// private var brotherButton : UIButton!
private var arrButtons : [UIButton] = []
lazy var noNetWorkTipsView: YHEmptyDataView = {
let view = YHEmptyDataView.createView("暂无内容", kEmptyCommonBgName)
view.topMargin = 0
view.backgroundColor = .white
view.isHidden = true
return view
}()
}
private extension YHPreviewFamilyMemberViewController {
func setupUI() {
noNetWorkTipsView.isHidden = false
noNetWorkTipsView.backgroundColor = UIColor.contentBkgColor
view.addSubview(self.noNetWorkTipsView)
self.noNetWorkTipsView.topMargin = 20
view.addSubview(buttonHoldView)
buttonHoldView.snp.makeConstraints { make in
make.top.equalToSuperview()
......@@ -259,6 +274,16 @@ private extension YHPreviewFamilyMemberViewController {
previewVM.arrDataForMainApplicationInfo = []
}
homeTableView.reloadData()
if previewVM.arrDataForMainApplicationInfo.count > 0 {
self.noNetWorkTipsView.isHidden = true
self.homeTableView.isHidden = false
} else {
self.noNetWorkTipsView.isHidden = false
self.homeTableView.isHidden = true
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 897dde1e
......@@ -1368,6 +1368,9 @@ private extension YHPreviewViewModel {
}
}
if model.follow == 1 { // 随行 才显示证件信息和证件照片
// 证件信息显示逻辑
var cerInfoArr = [YHPersonInfoCellModel1]()
let a = showCerInfoLogic(familyMember: model, mainApplicantInfo: mainApplicant)
......@@ -1452,6 +1455,7 @@ private extension YHPreviewViewModel {
let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片", cellData2: photoArr)
arrTemp.append(model4)
}
arrDataForSpouse = arrTemp
}
......@@ -1615,9 +1619,6 @@ private extension YHPreviewViewModel {
let tmp44 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: model.married.defaultStringIfEmpty())
var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp44]
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否和主申请人同住：", answer: model.nows == 1 ? "是" : "否")
arr.append(tmp10)
var liveAbord = false //海外
var address = ""
if model.nows == 0 {
......@@ -1648,12 +1649,6 @@ private extension YHPreviewViewModel {
arr.append(tmp12)
}
if true {
let title = model.isPreviousMarriageChild() ? "是" : "否"
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否为前次婚姻的子女", answer: title)
arr.append(tmp12)
}
if model.nows == 0 {
let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
arr.append(tmp133)
......@@ -1680,6 +1675,7 @@ private extension YHPreviewViewModel {
}
}
if model.follow == 1 { // 随行 才显示证件信息和证件照片
// 证件信息显示逻辑
var cerInfoArr = [YHPersonInfoCellModel1]()
let a = showCerInfoLogic(familyMember: model, mainApplicantInfo: mainApplicant)
......@@ -1764,7 +1760,9 @@ private extension YHPreviewViewModel {
let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片", cellData2: photoArr)
arrTemp.append(model4)
}
arrDataForChildren.append(contentsOf: arrTemp)
}
//子女 数据
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperiencePositionViewViewController.swift
View file @ 897dde1e
......@@ -186,7 +186,7 @@ extension YHWorkExperiencePositionViewViewController: UITableViewDelegate, UITab
guard let self = self else { return }
self.viewModel.updateModel(model)
let id = model.id
if id != .id1 && id != .id2 && id != .id6 && id != .id10 {
if id != .id1 && id != .id2 && id != .id6 && id != .id10 && id != .id11 {
self.updateDataSource()
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceListTableViewCell.swift
View file @ 897dde1e
......@@ -84,15 +84,15 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
subTitleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）"
label.text = "从获得有效学位（学士学位或以上）后第一份工作开始，直至最近一份工作"
label.textColor = UIColor.labelTextColor2
label.numberOfLines = 0
return label
}()
centerView.addSubview(subTitleLabel)
subTitleLabel.snp.makeConstraints { make in
make.left.equalTo(20)
make.top.equalTo(50)
make.height.equalTo(20)
make.right.equalTo(-20)
}
......
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