Commit 3099554a authored by David黄金龙's avatar David黄金龙

添加其他信息 预览界面及类型

parent c5e40fcd
......@@ -133,6 +133,9 @@
A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
A5167B272B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5167B262B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift */; };
A5167B332B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */; };
A5191F602B89E6FA001069F7 /* YHPreviewInfoQuestionAndAnswerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5191F5F2B89E6FA001069F7 /* YHPreviewInfoQuestionAndAnswerView.swift */; };
A5191F622B89E748001069F7 /* YHPreviewQuestionAndAnswerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5191F612B89E748001069F7 /* YHPreviewQuestionAndAnswerModel.swift */; };
A5191F642B89E926001069F7 /* YHOtherInfoPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5191F632B89E926001069F7 /* YHOtherInfoPreviewViewController.swift */; };
A5234E282B6E2EED00A33433 /* YHBasicInfoFillViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E272B6E2EED00A33433 /* YHBasicInfoFillViewController.swift */; };
A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E292B6E349600A33433 /* YHBasicInfoFillBottomView.swift */; };
A5234E2C2B6E3BA400A33433 /* YHBasicInfoFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E2B2B6E3BA400A33433 /* YHBasicInfoFillCell.swift */; };
......@@ -250,7 +253,7 @@
A5FD63DF2B6639AD00D1D9DA /* YHScoreDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63DE2B6639AD00D1D9DA /* YHScoreDataModel.swift */; };
A5FD63E42B678AC000D1D9DA /* YHPersonInformMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */; };
A5FD63E62B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */; };
A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */; };
A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift */; };
A5FD63EA2B67D95100D1D9DA /* YHFamilyMemberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */; };
A5FD63ED2B688A7000D1D9DA /* YHPreviewInfoTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63EC2B688A7000D1D9DA /* YHPreviewInfoTitleView.swift */; };
A5FD63EF2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63EE2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameView.swift */; };
......@@ -421,6 +424,9 @@
A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
A5167B262B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoIdentificationCardView.swift; sourceTree = "<group>"; };
A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoBaseViewController.swift; sourceTree = "<group>"; };
A5191F5F2B89E6FA001069F7 /* YHPreviewInfoQuestionAndAnswerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoQuestionAndAnswerView.swift; sourceTree = "<group>"; };
A5191F612B89E748001069F7 /* YHPreviewQuestionAndAnswerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewQuestionAndAnswerModel.swift; sourceTree = "<group>"; };
A5191F632B89E926001069F7 /* YHOtherInfoPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherInfoPreviewViewController.swift; sourceTree = "<group>"; };
A5234E272B6E2EED00A33433 /* YHBasicInfoFillViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillViewController.swift; sourceTree = "<group>"; };
A5234E292B6E349600A33433 /* YHBasicInfoFillBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillBottomView.swift; sourceTree = "<group>"; };
A5234E2B2B6E3BA400A33433 /* YHBasicInfoFillCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillCell.swift; sourceTree = "<group>"; };
......@@ -542,7 +548,7 @@
A5FD63DE2B6639AD00D1D9DA /* YHScoreDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScoreDataModel.swift; sourceTree = "<group>"; };
A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInformMainViewController.swift; sourceTree = "<group>"; };
A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoControllerHoldViewController.swift; sourceTree = "<group>"; };
A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMainApplicantInfoViewController.swift; sourceTree = "<group>"; };
A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMainApplicantInfoPreviewViewController.swift; sourceTree = "<group>"; };
A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "YH\U001dFamilyMemberViewController.swift"; sourceTree = "<group>"; };
A5FD63EC2B688A7000D1D9DA /* YHPreviewInfoTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoTitleView.swift; sourceTree = "<group>"; };
A5FD63EE2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoNameAndSubNameView.swift; sourceTree = "<group>"; };
......@@ -1014,6 +1020,7 @@
A5FD63F72B68D78A00D1D9DA /* YHPersonInfoCellModel1.swift */,
A5FD63FB2B68DA6600D1D9DA /* YHPersonInfoCellModel2.swift */,
A5FD63F92B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift */,
A5191F612B89E748001069F7 /* YHPreviewQuestionAndAnswerModel.swift */,
);
path = M;
sourceTree = "<group>";
......@@ -1026,6 +1033,7 @@
A5FD63EE2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameView.swift */,
A5FD63F02B68963200D1D9DA /* YHPreviewInfoHoldView.swift */,
A5F78C812B68F39600EEA170 /* YHPreviewInfoCell.swift */,
A5191F5F2B89E6FA001069F7 /* YHPreviewInfoQuestionAndAnswerView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -1036,8 +1044,9 @@
A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */,
A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */,
A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */,
A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */,
A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift */,
A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */,
A5191F632B89E926001069F7 /* YHOtherInfoPreviewViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -1751,6 +1760,7 @@
A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */,
A5F685F22B86D2E3006F4BF9 /* YHOtherPickerView.swift in Sources */,
A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */,
A5191F622B89E748001069F7 /* YHPreviewQuestionAndAnswerModel.swift in Sources */,
A5FD63DF2B6639AD00D1D9DA /* YHScoreDataModel.swift in Sources */,
A5ACE95E2B4571BF002C94D2 /* YHHomeViewController.swift in Sources */,
04E86E632B85EE9A00A35F4B /* YHWorkIntroductionViewModel.swift in Sources */,
......@@ -1807,7 +1817,7 @@
A5FD63F12B68963200D1D9DA /* YHPreviewInfoHoldView.swift in Sources */,
0468D4452B62064700CFB916 /* YHStepView.swift in Sources */,
A5C5B3232B57BF8F00A7C5D1 /* YHDavidCell1.swift in Sources */,
A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift in Sources */,
A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift in Sources */,
04E86E3A2B83321600A35F4B /* YHWorkExperienceModel.swift in Sources */,
A5FD63F82B68D78B00D1D9DA /* YHPersonInfoCellModel1.swift in Sources */,
A5FD63CD2B64E2D600D1D9DA /* YHScoreDetailViewController.swift in Sources */,
......@@ -1890,6 +1900,7 @@
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
A5234E282B6E2EED00A33433 /* YHBasicInfoFillViewController.swift in Sources */,
04E86E312B81EA1000A35F4B /* YHWorkItemView.swift in Sources */,
A5191F642B89E926001069F7 /* YHOtherInfoPreviewViewController.swift in Sources */,
0468D4492B6258A900CFB916 /* YHItemView.swift in Sources */,
041B528F2B5E620E007EBCEB /* YHFormItemInputTextCell.swift in Sources */,
04E86E612B85CAEA00A35F4B /* YHWorkExampleModel.swift in Sources */,
......@@ -1948,6 +1959,7 @@
A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */,
04E86E6A2B87352700A35F4B /* YHCompanySelectViewController.swift in Sources */,
A5191F602B89E6FA001069F7 /* YHPreviewInfoQuestionAndAnswerView.swift in Sources */,
04E86E452B8357EC00A35F4B /* YHItemModel.swift in Sources */,
A5ACE9302B4564F7002C94D2 /* Algorithm.swift in Sources */,
A5C5B32B2B57D17600A7C5D1 /* YHDavidCell5.swift in Sources */,
......
......@@ -8,9 +8,9 @@
import UIKit
/*
*家庭成员信息
*家庭成员信息 预览
*/
class YHFamilyMemberViewController: YHPersonInfoBaseViewController {
class YHFamilyMemberPreviewViewController: YHPersonInfoBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
......
......@@ -7,11 +7,10 @@
//
import UIKit
import JXSegmentedView
/*
*主申请人信息
*主申请人信息 预览
*/
class YHMainApplicantInfoViewController: YHPersonInfoBaseViewController {
class YHMainApplicantInfoPreviewViewController: YHPersonInfoBaseViewController {
var arrData : [YHPreviewInfoSessionModel] = []
override func viewDidLoad() {
super.viewDidLoad()
......@@ -21,7 +20,7 @@ class YHMainApplicantInfoViewController: YHPersonInfoBaseViewController {
}
private extension YHMainApplicantInfoViewController {
private extension YHMainApplicantInfoPreviewViewController {
func installData() {
do {
//国家信息
......@@ -107,7 +106,7 @@ private extension YHMainApplicantInfoViewController {
// MARK: - UITableViewDelegate 和 UITableViewDataSource
extension YHMainApplicantInfoViewController {
extension YHMainApplicantInfoPreviewViewController {
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return arrData.count
}
......
//
// YHOtherInfoPreviewViewController.swift
// galaxy
//
// Created by davidhuangA on 2024/2/24.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
/*
*其他信息 预览
*/
class YHOtherInfoPreviewViewController: YHPersonInfoBaseViewController {
var arrData : [YHPreviewInfoSessionModel] = []
override func viewDidLoad() {
super.viewDidLoad()
setupUI()
}
}
private extension YHOtherInfoPreviewViewController {
func installData() {
do {
//国家信息
let tmp0 = YHPreviewInfoBaseModel(name: "国家/国籍:", description: "中国-China")
let tmp1 = YHPreviewInfoBaseModel(name: "港澳通行证:", description: "未办理")
let arr = [tmp0,tmp1]
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "国籍信息", cellData0: arr)
arrData.append(model1)
}
do {
//基本信息
let tmp0 = YHPreviewInfoBaseModel(name: "主申请人:", description: "DavidHuang")
let tmp1 = YHPreviewInfoBaseModel(name: "曾用名:", description: "--")
let tmp2 = YHPreviewInfoBaseModel(name: "婚前姓氏:", description: "--")
let tmp3 = YHPreviewInfoBaseModel(name: "出生日期:", description: "1990年8月18日")
let tmp4 = YHPreviewInfoBaseModel(name: "出生城市:", description: "国内 吉林省/吉林市")
let tmp5 = YHPreviewInfoBaseModel(name: "性别:", description: "男")
let tmp6 = YHPreviewInfoBaseModel(name: "婚姻状况:", description: "已婚")
let tmp7 = YHPreviewInfoBaseModel(name: "手机号:", description: "13572984488")
let tmp8 = YHPreviewInfoBaseModel(name: "邮箱:", description: "13572984488@nn.com")
let tmp9 = YHPreviewInfoBaseModel(name: "现居住地址:", description: "现居住地址:现居住地址:现居住地址:现居住地址:现居住地址:现居住地址:")
let tmp10 = YHPreviewInfoBaseModel(name: "详细地址:", description: "锐度公园世家北区10-1-701锐度公园世家北区10-1-701")
let tmp11 = YHPreviewInfoBaseModel(name: "是否办理过香港身份证:", description: "是")
let tmp12 = YHPreviewInfoBaseModel(name: "香港身份证:", description: "否")
let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12]
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "基本信息", cellData0: arr)
arrData.append(model2)
}
do {
//证件信息
let tmp0 = YHPreviewInfoBaseModel(name: "中国身份证号码:", description: "2203381990287633390")
let tmp1 = YHPreviewInfoBaseModel(name: "签发地:", description: "北京市分局")
let tmp2 = YHPreviewInfoBaseModel(name: "签发日期:", description: "2018-07-17")
let tmp3 = YHPreviewInfoBaseModel(name: "届满日期:", description: "2028-07-31")
let model0 = YHPersonInfoCellModel1(cellTitle: "中国身份证", cellData: [tmp0,tmp1,tmp2,tmp3])
let tmp4 = YHPreviewInfoBaseModel(name: "旅行社证件号码:", description: "c2345639")
let tmp5 = YHPreviewInfoBaseModel(name: "签发地:", description: "北京市分局")
let tmp6 = YHPreviewInfoBaseModel(name: "签发日期:", description: "2018-07-17")
let tmp7 = YHPreviewInfoBaseModel(name: "届满日期:", description: "2028-07-31")
let model1 = YHPersonInfoCellModel1(cellTitle: "港澳通行证", cellData: [tmp4,tmp5,tmp6,tmp7])
let tmp8 = YHPreviewInfoBaseModel(name: "证件类别:", description: "护照")
let tmp9 = YHPreviewInfoBaseModel(name: "证件号码:", description: "p2345639")
let tmp10 = YHPreviewInfoBaseModel(name: "签发地:", description: "北京市分局")
let tmp11 = YHPreviewInfoBaseModel(name: "签发日期:", description: "2028-07-31")
let tmp12 = YHPreviewInfoBaseModel(name: "届满日期:", description: "2028-07-31")
let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp8,tmp9,tmp10,tmp11,tmp12])
let arr = [model0,model1,model2]
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息", cellData1: arr)
arrData.append(model3)
}
do {
//证件照片
let model1 = YHPersonInfoCellModel2(cellTitle: "中国身份证",frontUrl: "", backUrl: "", idType: 1)
let model2 = YHPersonInfoCellModel2(cellTitle: "港澳通行证",frontUrl: "", backUrl: "", idType: 2)
let arr = [model1,model2]
let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片", cellData2: arr)
arrData.append(model4)
}
}
func setupUI() {
installData()
self.homeTableView.register(YHPreviewInfoCell.self,forCellReuseIdentifier: YHPreviewInfoCell.cellReuseIdentifier)
self.homeTableView.reloadData()
}
}
// MARK: - UITableViewDelegate 和 UITableViewDataSource
extension YHOtherInfoPreviewViewController {
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return arrData.count
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self)
cell.selectionStyle = .none
cell.model = arrData[indexPath.row]
return cell
}
}
......@@ -49,27 +49,27 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
super.viewDidLoad()
do {
let vc = YHMainApplicantInfoViewController()
let vc = YHMainApplicantInfoPreviewViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
let vc = YHFamilyMemberPreviewViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
let vc = YHFamilyMemberPreviewViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
let vc = YHFamilyMemberPreviewViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
let vc = YHFamilyMemberPreviewViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
let vc = YHOtherInfoPreviewViewController()
arrItemVCs.append(vc)
}
......
//
// YHPreviewQuestionAndAnswerModel.swift
// galaxy
//
// Created by davidhuangA on 2024/2/24.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHPreviewQuestionAndAnswerModel {
var question : String = ""
var answer : String = ""
var remark : String = ""
}
//
// YHPreviewInfoQuestionAndAnswerView.swift
// galaxy
//
// Created by davidhuangA on 2024/2/24.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHPreviewInfoQuestionAndAnswerView: UIView {
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
//title
private lazy var nameLable : UILabel = {
let lable0 = UILabel(text: "--")
lable0.textColor = UIColor.labelTextColor2
lable0.font = UIFont.PFSC_R(ofSize: 14)
// lable0.numberOfLines = 1
// lable0.lineBreakMode = .byCharWrapping
return lable0
}()
//title
private lazy var subtitleLable : UILabel = {
let lable0 = UILabel(text: "--")
lable0.textColor = UIColor.mainTextColor
lable0.font = UIFont.PFSC_R(ofSize: 14)
lable0.numberOfLines = 0
lable0.lineBreakMode = .byWordWrapping
lable0.textAlignment = .right
return lable0
}()
private func setupUI() {
addSubview(nameLable)
nameLable.snp.makeConstraints { make in
make.top.equalToSuperview().offset(18)
make.left.equalToSuperview()
make.width.lessThanOrEqualTo(154)
make.height.equalTo(20)
}
nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
addSubview(subtitleLable)
subtitleLable.snp.makeConstraints { make in
make.top.equalTo(nameLable.snp.top)
make.right.equalToSuperview()
make.left.equalTo(nameLable.snp.right).offset(10)
make.bottom.equalToSuperview()
}
}
}
extension YHPreviewInfoQuestionAndAnswerView {
func update(title : String,subtitle : String) {
nameLable.text = title
subtitleLable.text = subtitle
}
}
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