Commit 197e1a2a authored by David黄金龙's avatar David黄金龙

Merge branch 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into qmas-1130

* 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  解决新增工作经验职位过多问题
  //  提交弹窗
  解决收入记录选择超过100万状态后进入修改工作经验再回来,选择超过100万状态丢失的bug
  升级七鱼SDK解决iOS18.1图片选择兼容性问题
  主申请人信息I预览UI修改
  // 学历
parents b453260d bc79c7f7
......@@ -104,7 +104,7 @@ target 'galaxy' do
#列表截图
pod 'TYSnapshotScroll', '0.4.0'
#七鱼SDK
pod 'QY_iOS_SDK', '9.9.0'
pod 'QY_iOS_SDK', '9.9.2'
#阿里云日志
pod 'AliyunLogProducer', '4.3.3'
......
This diff is collapsed.
......@@ -263,17 +263,17 @@ extension YHInformationPerfectListVC {
serviceCenterMainReqVM.submitAllInfoOp(params: ["orderId" : orderId]) { [weak self] success, error in
YHHUD.hide()
if success == true {
// let model = self?.serviceCenterMainReqVM.allInfoScoreModel
// YHSubmitAllInfoSuccessAlertView.showCheckView(model: model) { agree in
//
// //1、刷新当前界面
// self?.loadData()
//
// //2、跳转其他界面
// if agree == true {
// self?.goScoreVC()
// }
// }
let model = self?.serviceCenterMainReqVM.allInfoScoreModel
YHSubmitAllInfoSuccessAlertView.showCheckView(model: model) { agree in
//1、刷新当前界面
self?.loadData()
//2、跳转其他界面
if agree == true {
self?.goScoreVC()
}
}
//1、刷新当前界面
self?.loadData()
} else {
......
......@@ -43,7 +43,7 @@ class YHEducationCertificateConfirmCell: UITableViewCell {
}
if let isSelectTrue = isSelectTrue { // 进行过选择
if isSelectTrue == false {
let a: ASAttributedString = .init("若不能提供以上证明材料,将导致您的该收入", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
let a: ASAttributedString = .init("若不能提供以上证明材料,将导致您的该学历", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
let b: ASAttributedString = .init("不被认可不予加分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.failColor))
let c: ASAttributedString = .init(",请尽可能准备以上材料并修改此选项。", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
tipsLabel.attributed.text = a+b+c
......
......@@ -307,7 +307,10 @@ extension YHIncomeRecordViewController: UITableViewDelegate, UITableViewDataSour
if case let .incomeItem(_, _, _, _, incomeId) = tableRow {
let ctl = YHIncomeRecordWorkExperienceViewController(incomeId: incomeId)
ctl.submitSuccess = { [weak self] in
self?.requestData(isNeedLoading: true)
guard let self = self else {
return
}
self.requestData(isNeedLoading: true, lastSelectedIncomeOver100: self.incomeModel.income_over_100)
}
navigationController?.pushViewController(ctl, animated: true)
}
......@@ -327,7 +330,7 @@ extension YHIncomeRecordViewController {
return true
}
private func requestData(isNeedLoading: Bool = false) {
private func requestData(isNeedLoading: Bool = false, lastSelectedIncomeOver100: Int? = nil) {
if isNeedLoading {
YHHUD.show(.progress(message: "加载中..."))
}
......@@ -350,6 +353,9 @@ extension YHIncomeRecordViewController {
return
}
self.incomeModel = incomeModel
if let lastSelectedIncomeOver100 = lastSelectedIncomeOver100 {
self.incomeModel.income_over_100 = lastSelectedIncomeOver100
}
self.setupData()
}
}
......
......@@ -23,6 +23,8 @@ struct YHPersonInfoCellModel2: SmartCodable {
cellTitle = "中国身份证"
} else if idType == 2 {
cellTitle = "港澳通行证"
} else {
cellTitle = "护照"
}
}
}
......
......@@ -171,8 +171,19 @@ extension YHPreviewInfoCertificatePictureItemView {
func updateUI() {
guard let dataModel = dataModel else { return }
cellTitleLable.text = dataModel.cellTitle
frontLable.text = dataModel.idType == 1 ? "身份证头像面" : "港澳通行证正面"
backLable.text = dataModel.idType == 1 ? "身份证国徽面" : "港澳通行证反面"
var frontTitle = ""
var backTitle = ""
if dataModel.idType == 1 {
frontTitle = "身份证头像面"
backTitle = "身份证国徽面"
} else if dataModel.idType == 2 {
frontTitle = "港澳通行证正面"
backTitle = "港澳通行证反面"
} else {
frontTitle = "护照"
}
frontLable.text = frontTitle
backLable.text = backTitle
//获取头像
handleCardImage()
......@@ -194,6 +205,11 @@ extension YHPreviewInfoCertificatePictureItemView {
// let url2 = "https://upload-cdn.galaxy-immi.com/crm/test/files/1709370416082.png?Expires=1709697934&OSSAccessKeyId=LTAI5tJPQC4La6LWbcNoz61u&Signature=eKv4J8STMXSHFyJvozmHPgJdmY4%3D&v=1709696134"
if dataModel.idType == 3 {
backImagV.isHidden = true
} else {
backImagV.isHidden = false
}
let url2 = dataModel.backUrl
if url2.isEmpty == false {
self.requestVM.getPublicImageUrl(url2) {[weak self] success, error in
......
......@@ -558,13 +558,10 @@ private extension YHPreviewViewModel {
msg = model.married//后台 王辉维护这个字段 前端直接展示
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况:", answer: msg)
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "手机号:", answer: model.mobile)
let tmp8 = YHPreviewQuestionAndAnswerModel(question: "邮箱:", answer: model.email)
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "现居住地址:", answer:model.live_address)
var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9]
var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp9]
if model.live_address.contains("中国") == false {
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上:", answer: model.is_live_oversea_year == 1 ? "是" : "否")
arr.append(tmp10)
......@@ -611,79 +608,87 @@ private extension YHPreviewViewModel {
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期:", answer: str.defaultStringIfEmpty())
let model0 = YHPersonInfoCellModel1(cellTitle: "中国身份证", cellData: [tmp0,tmp1,tmp2,tmp3])
var arr = [model0]
//港澳通行证
if model.is_handled == 1 {
str = model2.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码:", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地:", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueDateStartAt
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "签发日期:", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueDateEndAt
if str.isEmpty {
str = ""
} else {
if str == "8888-01-01" {
str = "长期"
}
str = model2.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码:", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地:", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueDateStartAt
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "签发日期:", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueDateEndAt
if str.isEmpty {
str = ""
} else {
if str == "8888-01-01" {
str = "长期"
}
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期:", answer: str.defaultStringIfEmpty())
let model1 = YHPersonInfoCellModel1(cellTitle: "港澳通行证", cellData: [tmp4,tmp5,tmp6,tmp7])
arr.append(model1)
}
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期:", answer: str.defaultStringIfEmpty())
let model1 = YHPersonInfoCellModel1(cellTitle: "港澳通行证", cellData: [tmp4,tmp5,tmp6,tmp7])
str = model2.passport.number
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "证件号码:", answer: str.defaultStringIfEmpty())
str = model2.passport.issueAt
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "签发地:", answer: str.defaultStringIfEmpty())
if model.nationality != "中国-China" {
//护照及其他旅行证件
var str = model2.passport.type
let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别:", answer: str)
str = model2.passport.number
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "证件号码:", answer: str.defaultStringIfEmpty())
str = model2.passport.issueAt
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "签发地:", answer: str.defaultStringIfEmpty())
str = model2.passport.issueDateStartAt
let tmp11 = YHPreviewQuestionAndAnswerModel(question: "签发日期:", answer: str.defaultStringIfEmpty())
str = model2.passport.issueDateEndAt
if str.isEmpty {
str = ""
} else {
if str == "8888-01-01" {
str = "长期"
}
str = model2.passport.issueDateStartAt
let tmp11 = YHPreviewQuestionAndAnswerModel(question: "签发日期:", answer: str.defaultStringIfEmpty())
str = model2.passport.issueDateEndAt
if str.isEmpty {
str = ""
} else {
if str == "8888-01-01" {
str = "长期"
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期:", answer: str.defaultStringIfEmpty())
let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp8,tmp9,tmp10,tmp11,tmp12])
arr.append(model2)
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期:", answer: str.defaultStringIfEmpty())
let model2 = YHPersonInfoCellModel1(cellTitle: "护照", cellData: [tmp9,tmp10,tmp11,tmp12])
var arr:[YHPersonInfoCellModel1] = []
if (model.nationality.contains("中国") && model.live_address.contains("中国")) || ((model.nationality.contains("中国") && model.is_live_oversea_year == 0)) {
arr = [model0, model1]
} else if (model.nationality.contains("中国") && model.is_live_oversea_year == 1) {
arr = [model0, model2]
} else {
arr = [model2]
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息", cellData1: arr)
arrDataForMainApplicationInfo.append(model3)
}
//2.跟随 证件照
do {
var arr: [YHPersonInfoCellModel2] = []
//证件照片
let front = model2.cnIdentityCard.imgFront
let back = model2.cnIdentityCard.imgBack
let model1 = YHPersonInfoCellModel2(cellTitle: "中国身份证",frontUrl: front, backUrl: back, idType: 1)
var arr = [model1]
let model11 = YHPersonInfoCellModel2(cellTitle: "中国身份证",frontUrl: front, backUrl: back, idType: 1)
if model.is_handled == 1 {
let front = model2.hkMacaoPass.imgFront
let back = model2.hkMacaoPass.imgBack
let model2 = YHPersonInfoCellModel2(cellTitle: "港澳通行证",frontUrl: front, backUrl: back, idType: 2)
arr.append(model2)
let front1 = model2.hkMacaoPass.imgFront
let back1 = model2.hkMacaoPass.imgBack
let model22 = YHPersonInfoCellModel2(cellTitle: "港澳通行证",frontUrl: front1, backUrl: back1, idType: 2)
let front2 = model2.passport.imgFront
let model33 = YHPersonInfoCellModel2(cellTitle: "护照",frontUrl: front2, backUrl: "", idType: 3)
if (model.nationality.contains("中国") && model.live_address.contains("中国")) || (model.nationality.contains("中国") && model.is_live_oversea_year == 0) {
if model.is_handled == 1 {
arr = [model11, model22]
} else {
arr = [model11]
}
} else if model.nationality.contains("中国") && model.is_live_oversea_year == 1 {
arr = [model11, model33]
} else {
arr = [model33]
}
let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片", cellData2: arr)
arrDataForMainApplicationInfo.append(model4)
}
......
......@@ -78,6 +78,9 @@ class YHWorkExperienceViewController: YHBaseViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if workExperienceID == "0" {
return
}
viewModel.requestWorkPositionList("\(orderID)", workExperienceID ?? "") {[weak self] success, error in
guard let self = self else { return }
self.updateDataSource()
......
//
// YHSubmintAllInfoSuccessTipView.swift
// galaxy
//
// Created by davidhuangA on 2024/1/26.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHSubmintAllInfoSuccessTipView: UIView {
typealias Block = (Bool) -> ()
var block: Block?
var centerView: UIView!
var titleLabel: UILabel!
var messageLabel: UILabel!
var agreeButton: UIButton!
var disAgressButton: UIButton!
var model : YHContactInfoScoreModel? {
didSet {
guard let model = model else {
return
}
let a: ASAttributedString = .init(NSAttributedString(string: model.sum_score), .font(UIFont(name: "DINAlternate-Bold", size: 43) ?? UIFont.PFSC_M(ofSize: 43)),.foreground(UIColor.warnColor))
let b: ASAttributedString = .init("分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
messageLabel.attributed.text = a + b
}
}
//头部背景图片
lazy var headBkgImagV: UIImageView = {
let imagV = UIImageView()
imagV.image = UIImage(named: "submit_success_bkg")
imagV.contentMode = .scaleAspectFill
imagV.clipsToBounds = true
return imagV
}()
//头部背景图片
lazy var successIcon: UIImageView = {
let imagV = UIImageView()
imagV.image = UIImage(named: "submit_success_icon")
imagV.contentMode = .scaleAspectFill
return imagV
}()
static func showCheckView(model: YHContactInfoScoreModel?,callBack: @escaping Block) {
let view = YHSubmintAllInfoSuccessTipView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
view.block = callBack
view.model = model
let window = UIApplication.shared.yhKeyWindow()
window?.addSubview(view)
}
override init(frame: CGRect) {
super.init(frame: frame)
backgroundColor = UIColor(white: 0.5, alpha: 0.1)
let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
tap.delegate = self
addGestureRecognizer(tap)
setView()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func setView() {
backgroundColor = UIColor(hex: 0x0000, alpha: 0.5)
centerView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius8
return view
}()
addSubview(centerView)
centerView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.width.equalTo(299)
make.height.equalTo(338)
}
centerView.addSubview(headBkgImagV)
headBkgImagV.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.height.equalTo(159)
}
centerView.addSubview(successIcon)
successIcon.snp.makeConstraints { make in
make.top.equalTo(39)
make.centerX.equalToSuperview()
make.height.width.equalTo(73)
}
let lable = UILabel(text: "提交成功")
lable.textAlignment = .center
lable.font = UIFont.PFSC_M(ofSize: 17)
lable.textColor = UIColor.mainTextColor
headBkgImagV.addSubview(lable)
lable.snp.makeConstraints { make in
make.bottom.equalToSuperview().offset(6)
make.left.right.equalToSuperview()
}
let lable2 = UILabel(text: "根据您填写的资料,您的评分如下:")
lable2.textAlignment = .center
lable2.font = UIFont.PFSC_R(ofSize: 14)
lable2.textColor = UIColor.mainTextColor
centerView.addSubview(lable2)
lable2.snp.makeConstraints { make in
make.top.equalTo(headBkgImagV.snp.bottom).offset(10)
make.left.right.equalToSuperview()
}
messageLabel = {
let label = UILabel()
label.text = "--分"
label.textAlignment = .center
label.numberOfLines = 1
return label
}()
messageLabel.backgroundColor = .clear
centerView.addSubview(messageLabel)
messageLabel.snp.makeConstraints { make in
make.top.equalTo(lable2.snp.bottom).offset(10)
make.left.right.equalToSuperview()
make.height.equalTo(50)
}
let a: ASAttributedString = .init("90", .font(UIFont.PFSC_M(ofSize: 43)),.foreground(UIColor.warnColor))
let b: ASAttributedString = .init("分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
messageLabel.attributed.text = a + b
disAgressButton = {
let button = UIButton(type: .custom)
button.backgroundColor = .white
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("取消", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.layer.borderWidth = 1
button.layer.borderColor = UIColor.brandMainColor.cgColor
button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
return button
}()
centerView.addSubview(disAgressButton)
disAgressButton.snp.makeConstraints { make in
make.left.equalTo(kMargin)
make.bottom.equalTo(-21)
make.width.equalTo(128)
make.height.equalTo(45)
}
agreeButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("评分详情", for: .normal)
button.setTitleColor(.white, for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.addTarget(self, action: #selector(agree), for: .touchUpInside)
return button
}()
centerView.addSubview(agreeButton)
agreeButton.snp.makeConstraints { make in
make.right.equalTo(-kMargin)
make.bottom.equalTo(-21)
make.width.equalTo(128)
make.height.equalTo(45)
}
agreeButton.layoutIfNeeded()
agreeButton.addYinHeGradualLayer()
}
@objc func agree() {
block?(true)
dismiss()
}
@objc private func handleTap(_ sender: AnyObject?) {
dismiss()
}
@objc func disagree() {
block?(false)
dismiss()
}
func dismiss() {
removeFromSuperview()
}
}
extension YHSubmintAllInfoSuccessTipView: UIGestureRecognizerDelegate {
func gestureRecognizer(_ gestureRecognizer:UIGestureRecognizer, shouldReceive touch:UITouch) -> Bool {
if touch.view == self {
return true
}
return false
}
}
......@@ -28,9 +28,9 @@ class YHSubmitAllInfoSuccessAlertView: UIView {
guard let model = model else {
return
}
let a: ASAttributedString = .init(NSAttributedString(string: model.sum_score), .font(self.scoreBigFont),.foreground(self.scoreBigColor))
let b: ASAttributedString = .init("分", .font(self.scoreSmallFont),.foreground(self.scoreSmallColor))
scoreLabel.attributed.text = a + b
// let a: ASAttributedString = .init(NSAttributedString(string: model.sum_score), .font(self.scoreBigFont),.foreground(self.scoreBigColor))
// let b: ASAttributedString = .init("分", .font(self.scoreSmallFont),.foreground(self.scoreSmallColor))
// scoreLabel.attributed.text = a + b
}
}
......@@ -99,24 +99,24 @@ class YHSubmitAllInfoSuccessAlertView: UIView {
make.edges.equalToSuperview()
}
scoreLabel = {
let label = UILabel()
label.text = "--分"
label.textAlignment = .left
label.numberOfLines = 1
return label
}()
scoreLabel.backgroundColor = .clear
centerView.addSubview(scoreLabel)
scoreLabel.snp.makeConstraints { make in
make.bottom.equalTo(-45)
make.left.equalTo(20)
make.height.equalTo(55)
}
let a: ASAttributedString = .init("0", .font(self.scoreBigFont), .foreground(scoreBigColor))
let b: ASAttributedString = .init("分", .font(scoreSmallFont), .foreground(scoreSmallColor))
scoreLabel.attributed.text = a + b
// scoreLabel = {
// let label = UILabel()
// label.text = "--分"
// label.textAlignment = .left
// label.numberOfLines = 1
// return label
// }()
// scoreLabel.backgroundColor = .clear
// centerView.addSubview(scoreLabel)
// scoreLabel.snp.makeConstraints { make in
// make.bottom.equalTo(-45)
// make.left.equalTo(20)
// make.height.equalTo(55)
// }
//
// let a: ASAttributedString = .init("0", .font(self.scoreBigFont), .foreground(scoreBigColor))
// let b: ASAttributedString = .init("分", .font(scoreSmallFont), .foreground(scoreSmallColor))
// scoreLabel.attributed.text = a + b
cancelButton = {
let button = UIButton(type: .custom)
......
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