Skip to content

G
galaxy-iOS
Commit a5ba1bea authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

Merge branch 'qmas-1130' into AI-1212

parents 9819c93f e3f9ab7c
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 34 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ a5ba1bea
......@@ -6772,7 +6772,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -6914,7 +6914,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7119,7 +7119,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7166,7 +7166,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ a5ba1bea
......@@ -237,8 +237,8 @@ extension YHInformationPerfectListVC {
} else {
self.hasSubmitFlag = false
self.submitBtn.isHidden = true
self.submitHoldView.isHidden = false
self.submitBtn.isHidden = false
self.submitHoldView.isHidden = true
if self.serviceCenterMainReqVM.informationFillStepModel?.step == 6 {
self.submitBtn.layer.opacity = 1
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift
View file @ a5ba1bea
......@@ -141,12 +141,12 @@ extension YHHKPlanDoctumentVC {
let params = ["order_id":orderID,
"supplement_id":supplement_id,
"career_achievement":viewModel.arrHKPlanData[0].content,
"professional_skills":viewModel.arrHKPlanData[1].content,
"academic_achievement":viewModel.arrHKPlanData[2].content,
"plan_detail":viewModel.arrHKPlanData[3].content,
"qualifications_and_awards":viewModel.arrHKPlanData[4].content,
"other":viewModel.arrHKPlanData[5].content,
"remark":viewModel.arrHKPlanData[6].content,
"academic_achievement":viewModel.arrHKPlanData[1].content,
"qualifications_and_awards":viewModel.arrHKPlanData[2].content,
"professional_skills":viewModel.arrHKPlanData[3].content,
"visa_contribution":viewModel.arrHKPlanData[4].content,
"plan_detail":viewModel.arrHKPlanData[5].content,
"other":viewModel.arrHKPlanData[6].content,
"content_save":1]
cancelTimer()
startTimer()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift
View file @ a5ba1bea
......@@ -127,7 +127,7 @@ private extension YHHKPlanItemView {
backgroundColor = .clear
//应香港入境处最新要求，
//赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)
//赴港计划书格式、内容作出调整，共分为七部分，每部分不得超过100字(不含标点)
//。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。
addSubview(line)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanTipsCell.swift
View file @ a5ba1bea
......@@ -41,7 +41,7 @@ private extension YHHKPlanTipsCell {
contentView.backgroundColor = .clear
//应香港入境处最新要求，
//赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)
//赴港计划书格式、内容作出调整，共分为七部分，每部分不得超过100字(不含标点)
//。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。
let holdView : UIView = UIView()
......@@ -84,7 +84,7 @@ private extension YHHKPlanTipsCell {
let a: ASAttributedString = .init("应香港入境处最新要求，", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
let b: ASAttributedString = .init("赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过对应字数", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
let b: ASAttributedString = .init("赴港计划书格式、内容作出调整，共分为七部分，每部分不得超过对应字数", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
let c: ASAttributedString = .init("。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHMyNewSchemeViewController.swift
View file @ a5ba1bea
......@@ -436,6 +436,10 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
[weak self] in
guard let self = self else { return }
if !self.viewModel.schemeModel.certificate_skip_status {
YHHUD.flash(message: "您的资料清单正在准备中，请耐心等待")
return
}
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
let vc = YHMineCertificateEntryViewController()
vc.orderId = orderID as? Int ?? 0
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/M/YHSchemeModel.swift
View file @ a5ba1bea
......@@ -33,6 +33,7 @@ class YHMySchemeDetailModel: SmartCodable {
var industry_positioning_other: String = ""
var plan_skip_status: Bool = false
var supplement_skip_status: Bool = false
var certificate_skip_status: Bool = false
var username: String = ""
var sex: String = ""
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemTitleCell.swift
View file @ a5ba1bea
......@@ -61,7 +61,7 @@ class YHFormItemTitleCell: UITableViewCell {
lazy var cancelButton: UIButton = {
let btn = UIButton()
btn.setTitle("取消操作".local, for: .normal)
btn.setTitle("取消编辑".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(.brandMainColor, for: .normal)
btn.tag = cancelTag
......@@ -72,7 +72,9 @@ class YHFormItemTitleCell: UITableViewCell {
lazy var editButton: UIButton = {
let btn = UIButton()
btn.setImage(UIImage(named: "form_edit"), for: .normal)
btn.setTitle("编辑", for: .normal)
btn.setTitleColor(.brandMainColor, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.tag = editTag
btn.addTarget(self, action: #selector(didClickOperatorBtn(btn:)), for: .touchUpInside)
btn.isHidden = true
......@@ -105,9 +107,9 @@ class YHFormItemTitleCell: UITableViewCell {
}
editButton.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(24, 24))
make.size.equalTo(CGSizeMake(64, 24))
make.top.equalTo(titleLabel).offset(0)
make.right.equalToSuperview().offset(-18)
make.right.equalToSuperview().offset(0)
}
cancelButton.snp.makeConstraints { make in
......@@ -127,7 +129,7 @@ class YHFormItemTitleCell: UITableViewCell {
case .canEdit:
cancelButton.isHidden = true
editButton.isHidden = false
titleMaxRight = -(horizonalGap+24.0+5.0)
titleMaxRight = -(horizonalGap+46.0+5.0)
case .canCancel:
cancelButton.isHidden = false
editButton.isHidden = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeInputMoneyCell.swift
View file @ a5ba1bea
......@@ -9,6 +9,7 @@
import UIKit
class YHIncomeInputMoneyCell: YHResignDocumentCell {
private let maxCount = 12
static let cellReuseIdentifier = "YHIncomeInputMoneyCell"
......@@ -208,6 +209,11 @@ extension YHIncomeInputMoneyCell: UITextFieldDelegate {
if (string as NSString).rangeOfCharacter(from: number.inverted).location != NSNotFound {
return false
}
let count = (textField.text?.utf16.count ?? 0) - range.length + string.utf16.count
if count > maxCount {
return false
}
return true
}
return true
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherSingleChoiceItemView.swift
View file @ a5ba1bea
......@@ -7,6 +7,7 @@
//
import UIKit
import AttributedString
class YHOtherSingleChoiceItemView: UIView {
override init(frame: CGRect) {
......@@ -101,6 +102,32 @@ extension YHOtherSingleChoiceItemView {
isSelected = model.select
setViewSelected()
if !model.subname.isEmpty,!model.highlight.isEmpty {
if #available(iOS 16.0, *) {
let arr = model.subname.split(separator: model.highlight)
if arr.count == 2 {
let aa: ASAttributedString = .init(NSAttributedString(string: String(arr[0])), .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
let bb: ASAttributedString = .init(NSAttributedString(string: model.highlight), .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.failColor))
let cc: ASAttributedString = .init(NSAttributedString(string: String(arr[1])), .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
descLabel.attributed.text = aa + bb + cc
} else {
descLabel.attributed.text = nil
descLabel.text = model.subname
}
} else {
descLabel.attributed.text = nil
descLabel.text = model.subname
}
} else {
}
}
func setViewSelected() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ a5ba1bea
......@@ -648,7 +648,7 @@ private extension YHPreviewViewModel {
//港澳通行证
str = model2.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: str.defaultStringIfEmpty())
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行证件号码：", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: str.defaultStringIfEmpty())
......@@ -1374,7 +1374,7 @@ private extension YHPreviewViewModel {
if isNeedShowHK {
var str = model.certificates.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: str.defaultStringIfEmpty())
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行证件号码：", answer: str.defaultStringIfEmpty())
str = model.certificates.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: str.defaultStringIfEmpty())
......@@ -1416,7 +1416,7 @@ private extension YHPreviewViewModel {
}
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp9,tmp10,tmp11,tmp12])
let model2 = YHPersonInfoCellModel1(cellTitle: "护照", cellData: [tmp9,tmp10,tmp11,tmp12])
cerInfoArr.append(model2)
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息", cellData1: cerInfoArr)
......@@ -1686,7 +1686,7 @@ private extension YHPreviewViewModel {
if isNeedShowHK {
var str = model.certificates.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: str.defaultStringIfEmpty())
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行证件号码：", answer: str.defaultStringIfEmpty())
str = model.certificates.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: str.defaultStringIfEmpty())
......@@ -1728,7 +1728,7 @@ private extension YHPreviewViewModel {
}
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp9,tmp10,tmp11,tmp12])
let model2 = YHPersonInfoCellModel1(cellTitle: "护照", cellData: [tmp9,tmp10,tmp11,tmp12])
cerInfoArr.append(model2)
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息", cellData1: cerInfoArr)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift
View file @ a5ba1bea
......@@ -74,6 +74,10 @@ class YHWorkExperienceListViewController: YHBaseViewController {
bottom.nextblock = { [weak self] in
guard let self = self else { return }
guard let dataSource = dataSource else { return }
if dataSource.count == 0 {
YHHUD.flash(message: "至少需要有一条工作经验")
return
}
for item in dataSource {
if item.vacant_num ?? 0 > 0 {
showPrompt = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift
View file @ a5ba1bea
......@@ -251,6 +251,12 @@ class YHWorkExperienceViewController: YHBaseViewController {
guard let self = self else { return }
if self.viewModel.isCanNext(self.stepView.currentIndex) {
if self.stepView.currentIndex == 0 {
if self.viewModel.positionList.count == 0 {
self.isShowPrompt = true
tableView.reloadData()
YHHUD.flash(message: "至少需要新增一个职位")
return
}
for item in self.viewModel.positionList {
if item.missing_item_num > 0 {
self.isShowPrompt = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceListTableViewCell.swift
View file @ a5ba1bea
......@@ -99,8 +99,8 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
cannalButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("取消操作", for: .normal)
button.contentHorizontalAlignment = .right
button.setTitle("取消编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(cannal), for: .touchUpInside)
button.isHidden = true
......@@ -116,7 +116,10 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
moreButton = {
let button = UIButton(type: .custom)
button.setBackgroundImage(UIImage(named: "work_more"), for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right
button.setTitle("编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(more), for: .touchUpInside)
return button
}()
......@@ -124,8 +127,8 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
moreButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(24)
make.height.equalTo(24)
make.width.equalTo(24)
make.height.equalTo(20)
make.width.equalTo(60)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperiencePositionTableViewCell.swift
View file @ a5ba1bea
......@@ -100,7 +100,7 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("取消操作", for: .normal)
button.setTitle("取消编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(cannal), for: .touchUpInside)
button.isHidden = true
......@@ -116,7 +116,10 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
moreButton = {
let button = UIButton(type: .custom)
button.setBackgroundImage(UIImage(named: "work_more"), for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right
button.setTitle("编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(more), for: .touchUpInside)
return button
}()
......@@ -124,8 +127,8 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
moreButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(24)
make.height.equalTo(24)
make.width.equalTo(24)
make.height.equalTo(20)
make.width.equalTo(60)
}
......
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