Skip to content

G
galaxy-iOS
Commit 5baeea8d authored by David黄金龙's avatar David黄金龙
Browse files
Options

统一 使用一个模型

parent f3669652
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 125 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 5baeea8d
......@@ -262,7 +262,6 @@
A5FD63ED2B688A7000D1D9DA /* YHPreviewInfoSingleLineTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63EC2B688A7000D1D9DA /* YHPreviewInfoSingleLineTitleView.swift */; };
A5FD63EF2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63EE2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameItemView.swift */; };
A5FD63F12B68963200D1D9DA /* YHPreviewInfoHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63F02B68963200D1D9DA /* YHPreviewInfoHoldView.swift */; };
A5FD63F42B68CCE900D1D9DA /* YHPreviewInfoBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63F32B68CCE900D1D9DA /* YHPreviewInfoBaseModel.swift */; };
A5FD63F62B68D13200D1D9DA /* YHPreviewInfoSessionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63F52B68D13200D1D9DA /* YHPreviewInfoSessionModel.swift */; };
A5FD63F82B68D78B00D1D9DA /* YHPersonInfoCellModel1.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63F72B68D78A00D1D9DA /* YHPersonInfoCellModel1.swift */; };
A5FD63FA2B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63F92B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift */; };
......@@ -561,7 +560,6 @@
A5FD63EC2B688A7000D1D9DA /* YHPreviewInfoSingleLineTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoSingleLineTitleView.swift; sourceTree = "<group>"; };
A5FD63EE2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoNameAndSubNameItemView.swift; sourceTree = "<group>"; };
A5FD63F02B68963200D1D9DA /* YHPreviewInfoHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoHoldView.swift; sourceTree = "<group>"; };
A5FD63F32B68CCE900D1D9DA /* YHPreviewInfoBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoBaseModel.swift; sourceTree = "<group>"; };
A5FD63F52B68D13200D1D9DA /* YHPreviewInfoSessionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoSessionModel.swift; sourceTree = "<group>"; };
A5FD63F72B68D78A00D1D9DA /* YHPersonInfoCellModel1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoCellModel1.swift; sourceTree = "<group>"; };
A5FD63F92B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoIdentityCardModel.swift; sourceTree = "<group>"; };
......@@ -1023,7 +1021,6 @@
A5167B2E2B6A23F50084C08F /* M */ = {
isa = PBXGroup;
children = (
A5FD63F32B68CCE900D1D9DA /* YHPreviewInfoBaseModel.swift */,
A5FD63F52B68D13200D1D9DA /* YHPreviewInfoSessionModel.swift */,
A5FD63F72B68D78A00D1D9DA /* YHPersonInfoCellModel1.swift */,
A5FD63FB2B68DA6600D1D9DA /* YHPersonInfoCellModel2.swift */,
......@@ -1807,7 +1804,6 @@
A5FD63FC2B68DA6600D1D9DA /* YHPersonInfoCellModel2.swift in Sources */,
A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
A5FD63E42B678AC000D1D9DA /* YHPersonInformMainViewController.swift in Sources */,
A5FD63F42B68CCE900D1D9DA /* YHPreviewInfoBaseModel.swift in Sources */,
A5FD63C52B637EE000D1D9DA /* YHSubmitAllInfoCheckView.swift in Sources */,
A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */,
0468D4282B50D4AF00CFB916 /* YHPrivacyAlertView.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHMainApplicantInfoPreviewViewController.swift
View file @ 5baeea8d
......@@ -24,8 +24,8 @@ private extension YHMainApplicantInfoPreviewViewController {
func installData() {
do {
//国家信息
let tmp0 = YHPreviewInfoBaseModel(name: "国家/国籍：", description: "中国-China")
let tmp1 = YHPreviewInfoBaseModel(name: "港澳通行证：", description: "未办理")
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: "中国-China")
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: "未办理")
let arr = [tmp0,tmp1]
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "国籍信息", cellData0: arr)
arrData.append(model1)
......@@ -33,21 +33,21 @@ private extension YHMainApplicantInfoPreviewViewController {
do {
//基本信息
let tmp0 = YHPreviewInfoBaseModel(name: "主申请人：", description: "DavidHuang")
let tmp1 = YHPreviewInfoBaseModel(name: "曾用名：", description: "--")
let tmp2 = YHPreviewInfoBaseModel(name: "婚前姓氏：", description: "--")
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "主申请人：", answer: "DavidHuang")
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: "--")
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: "--")
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 tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: "1990年8月18日")
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: "国内 吉林省/吉林市")
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: "男")
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: "已婚")
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "手机号：", answer: "13572984488")
let tmp8 = YHPreviewQuestionAndAnswerModel(question: "邮箱：", answer: "13572984488@nn.com")
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer: "现居住地址：现居住地址：现居住地址：现居住地址：现居住地址：现居住地址：")
let tmp10 = YHPreviewInfoBaseModel(name: "详细地址：", description: "锐度公园世家北区10-1-701锐度公园世家北区10-1-701")
let tmp11 = YHPreviewInfoBaseModel(name: "是否办理过香港身份证：", description: "是")
let tmp12 = YHPreviewInfoBaseModel(name: "香港身份证：", description: "否")
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: "锐度公园世家北区10-1-701锐度公园世家北区10-1-701")
let tmp11 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "是")
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "香港身份证：", answer: "否")
let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12]
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "基本信息", cellData0: arr)
......@@ -57,25 +57,25 @@ private extension YHMainApplicantInfoPreviewViewController {
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 tmp0 = YHPreviewQuestionAndAnswerModel(question: "中国身份证号码：", answer: "2203381990287633390")
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: "北京市分局")
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "签发日期：", answer: "2018-07-17")
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: "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 tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: "c2345639")
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: "北京市分局")
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "签发日期：", answer: "2018-07-17")
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: "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 tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: "护照")
let tmp9 = YHPreviewQuestionAndAnswerModel(question: "证件号码：", answer: "p2345639")
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: "北京市分局")
let tmp11 = YHPreviewQuestionAndAnswerModel(question: "签发日期：", answer: "2028-07-31")
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: "2028-07-31")
let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp8,tmp9,tmp10,tmp11,tmp12])
let arr = [model0,model1,model2]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHOtherInfoPreviewViewController.swift
View file @ 5baeea8d
......@@ -23,76 +23,25 @@ class YHOtherInfoPreviewViewController: YHPersonInfoBaseViewController {
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 tmp0 = YHPreviewQuestionAndAnswerModel(question: "开始时间：", answer: "1990年8月")
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "结束时间：", answer: "2013年7月")
let model0 = YHPersonInfoCellModel1(cellTitle: "国家1:中国", cellData: [tmp0,tmp1])
let tmp10 = YHPreviewInfoBaseModel(name: "详细地址：", description: "锐度公园世家北区10-1-701锐度公园世家北区10-1-701")
let tmp11 = YHPreviewInfoBaseModel(name: "是否办理过香港身份证：", description: "是")
let tmp12 = YHPreviewInfoBaseModel(name: "香港身份证：", description: "否")
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "开始时间：", answer: "1990年8月")
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "结束时间：", answer: "2013年7月")
let model1 = YHPersonInfoCellModel1(cellTitle: "国家1:中国2", cellData: [tmp2,tmp3])
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 = YHPreviewQuestionAndAnswerModel(question: "开始时间：", answer: "1990年8月")
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "结束时间：", answer: "2013年7月")
let model2 = YHPersonInfoCellModel1(cellTitle: "国家1:中国3", cellData: [tmp4,tmp5])
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)
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() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHPersonInfoCellModel1.swift
View file @ 5baeea8d
......@@ -7,9 +7,9 @@
//
import UIKit
import SmartCodable
//import SmartCodable
struct YHPersonInfoCellModel1: SmartCodable {
struct YHPersonInfoCellModel1 {
var cellTitle : String = ""
var cellData : [YHPreviewInfoBaseModel] = []
var cellData : [YHPreviewQuestionAndAnswerModel] = []
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHPreviewInfoBaseModel.swift deleted 100644 → 0
View file @ f3669652
//
// YHPersonInfoBaseModel.swift
// galaxy
//
// Created by davidhuangA on 2024/1/30.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
struct YHPreviewInfoBaseModel: SmartCodable {
var name : String = ""
var description : String = ""
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHPreviewInfoSessionModel.swift
View file @ 5baeea8d
......@@ -21,7 +21,7 @@ enum YHPreviewInfoSessionModelType: Int {
struct YHPreviewInfoSessionModel {
var cellType : YHPreviewInfoSessionModelType = .countryInfoType
var cellTitle : String = ""
var cellData0 : [YHPreviewInfoBaseModel]? = nil
var cellData0 : [YHPreviewQuestionAndAnswerModel]? = nil
var cellData1 : [YHPersonInfoCellModel1]? = nil
var cellData2 : [YHPersonInfoCellModel2]? = nil
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHPreviewQuestionAndAnswerModel.swift
View file @ 5baeea8d
......@@ -7,8 +7,11 @@
//
import UIKit
class YHPreviewQuestionAndAnswerModel {
//import SmartCodable
struct YHPreviewQuestionAndAnswerModel {
var question : String = ""
var answer : String = ""
var remark : String = ""
var remark : String?
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoCertificateInformationItemsView.swift
View file @ 5baeea8d
......@@ -56,7 +56,7 @@ extension YHPreviewInfoCertificateInformationItemsView {
if arrData0.count > 0 {
for(index,item) in arrData0.enumerated() {
let cellView = YHPreviewInfoNameAndSubNameItemView()
cellView.update(title: item.name, subtitle: item.description)
cellView.update(title: item.question, subtitle: item.answer)
addSubview(cellView)
if index == 0 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoQuestionAndAnswerItemView.swift
View file @ 5baeea8d
......@@ -76,14 +76,13 @@ class YHPreviewInfoQuestionAndAnswerItemView: UIView {
}
// addSubview(remarkTextField)
// remarkTextField.snp.makeConstraints { make in
// make.top.equalTo(subtitleLable.snp.bottom).offset(8)
// make.right.equalToSuperview()
// make.left.equalToSuperview()
//
addSubview(remarkTextField)
remarkTextField.snp.makeConstraints { make in
make.top.equalTo(subtitleLable.snp.bottom).offset(8)
make.right.equalToSuperview()
make.left.equalToSuperview()
// make.bottom.equalToSuperview().offset(-18)
// }
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoQuestionAndAnswerItemsView.swift
View file @ 5baeea8d
......@@ -34,7 +34,7 @@ extension YHPreviewInfoQuestionAndAnswerItemsView {
if arrData.count == 1 {
let item = arrData[0]
let cellView = YHPreviewInfoNameAndSubNameItemView()
cellView.update(title: item.name, subtitle: item.description)
cellView.update(title: item.question, subtitle: item.answer)
addSubview(cellView)
cellView.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
......@@ -46,7 +46,7 @@ extension YHPreviewInfoQuestionAndAnswerItemsView {
var tmp : UIView = sessionView
for(index,item) in arrData.enumerated() {
let cellView = YHPreviewInfoNameAndSubNameItemView()
cellView.update(title: item.name, subtitle: item.description)
cellView.update(title: item.question, subtitle: item.answer)
addSubview(cellView)
if index == arrData.count - 1 {
......
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