Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
galaxy-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mobile-group
galaxy-iOS
Commits
907e251e
Commit
907e251e
authored
Oct 14, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 信息确认
parent
964131aa
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
315 additions
and
10 deletions
+315
-10
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+16
-4
YHServiceOrderListViewController.swift
...entService(服务中心)/C/YHServiceOrderListViewController.swift
+3
-0
YHResignConfirmInfoListViewController.swift
...irm(续签信息确认)/C/YHResignConfirmInfoListViewController.swift
+27
-5
YHResignInfoConfirmModifyViewController.swift
...m(续签信息确认)/C/YHResignInfoConfirmModifyViewController.swift
+19
-0
YHResignInfoConfirmInfoListModel.swift
...oConfirm(续签信息确认)/M/YHResignInfoConfirmInfoListModel.swift
+182
-0
YHResignFamilyMemberInfoCell.swift
...nInfoConfirm(续签信息确认)/V/YHResignFamilyMemberInfoCell.swift
+1
-1
YHResignInfoConfirmIViewModel.swift
...nfoConfirm(续签信息确认)/VM/YHResignInfoConfirmIViewModel.swift
+60
-0
YHAllApiName.swift
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
+7
-0
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
907e251e
...
...
@@ -195,6 +195,9 @@
044D0C1E2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1D2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift */
;
};
044D0C202C22D37500C5CF5E
/* YHEditHonorViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044D0C1F2C22D37500C5CF5E
/* YHEditHonorViewController.swift */
;
};
044E31C52CBCFDD200500F8E
/* YHResignAppointGuideLineView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044E31C42CBCFDD200500F8E
/* YHResignAppointGuideLineView.swift */
;
};
044E31C72CBD264D00500F8E
/* YHResignInfoConfirmInfoListModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044E31C62CBD264D00500F8E
/* YHResignInfoConfirmInfoListModel.swift */
;
};
044E31C92CBD2AA400500F8E
/* YHResignInfoConfirmIViewModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044E31C82CBD2AA400500F8E
/* YHResignInfoConfirmIViewModel.swift */
;
};
044E31CB2CBD336800500F8E
/* YHResignInfoConfirmModifyViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044E31CA2CBD336800500F8E
/* YHResignInfoConfirmModifyViewController.swift */
;
};
044EE2232C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044EE2222C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift */
;
};
044EE2252C90138000A2FE3A
/* YHServerCenterHoldViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044EE2242C90138000A2FE3A
/* YHServerCenterHoldViewController.swift */
;
};
044EE2272C91367800A2FE3A
/* YHServiceStepThreeSectionView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
044EE2262C91367800A2FE3A
/* YHServiceStepThreeSectionView.swift */
;
};
...
...
@@ -497,7 +500,7 @@
048FA0342BFDDFF400AD3BA9
/* submit_page_scroll.gif in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
048FA0322BFDDFF400AD3BA9
/* submit_page_scroll.gif */
;
};
048FA0362BFDE04000AD3BA9
/* YHSubmitAllInfoSuccessAlertView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
048FA0352BFDE04000AD3BA9
/* YHSubmitAllInfoSuccessAlertView.swift */
;
};
04912F602CB6697300CC3105
/* YHResignRiskWarningAlertView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04912F5F2CB6697300CC3105
/* YHResignRiskWarningAlertView.swift */
;
};
04912F622CB66E6300CC3105
/* YHResign
InfoConfirmViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04912F612CB66E6300CC3105
/* YHResignInfoConfirm
ViewController.swift */
;
};
04912F622CB66E6300CC3105
/* YHResign
ConfirmInfoListViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04912F612CB66E6300CC3105
/* YHResignConfirmInfoList
ViewController.swift */
;
};
04912F642CB6885D00CC3105
/* YHResignFamilyMemberInfoCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04912F632CB6885D00CC3105
/* YHResignFamilyMemberInfoCell.swift */
;
};
04912F6E2CB6A64700CC3105
/* YHResignAppointSubmitTipsView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04912F6D2CB6A64700CC3105
/* YHResignAppointSubmitTipsView.swift */
;
};
04912F702CB765FE00CC3105
/* YHResignAppointTimeViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04912F6F2CB765FE00CC3105
/* YHResignAppointTimeViewController.swift */
;
};
...
...
@@ -1141,6 +1144,9 @@
044D0C1D2C22CFBF00C5CF5E
/* YHEditWorkViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditWorkViewController.swift
;
sourceTree
=
"<group>"
;
};
044D0C1F2C22D37500C5CF5E
/* YHEditHonorViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHEditHonorViewController.swift
;
sourceTree
=
"<group>"
;
};
044E31C42CBCFDD200500F8E
/* YHResignAppointGuideLineView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignAppointGuideLineView.swift
;
sourceTree
=
"<group>"
;
};
044E31C62CBD264D00500F8E
/* YHResignInfoConfirmInfoListModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignInfoConfirmInfoListModel.swift
;
sourceTree
=
"<group>"
;
};
044E31C82CBD2AA400500F8E
/* YHResignInfoConfirmIViewModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignInfoConfirmIViewModel.swift
;
sourceTree
=
"<group>"
;
};
044E31CA2CBD336800500F8E
/* YHResignInfoConfirmModifyViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignInfoConfirmModifyViewController.swift
;
sourceTree
=
"<group>"
;
};
044EE2222C8FE1D000A2FE3A
/* YHServiceCenterViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHServiceCenterViewController.swift
;
sourceTree
=
"<group>"
;
};
044EE2242C90138000A2FE3A
/* YHServerCenterHoldViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHServerCenterHoldViewController.swift
;
sourceTree
=
"<group>"
;
};
044EE2262C91367800A2FE3A
/* YHServiceStepThreeSectionView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHServiceStepThreeSectionView.swift
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1446,7 +1452,7 @@
048FA0322BFDDFF400AD3BA9
/* submit_page_scroll.gif */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.gif
;
path
=
submit_page_scroll.gif
;
sourceTree
=
"<group>"
;
};
048FA0352BFDE04000AD3BA9
/* YHSubmitAllInfoSuccessAlertView.swift */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHSubmitAllInfoSuccessAlertView.swift
;
sourceTree
=
"<group>"
;
};
04912F5F2CB6697300CC3105
/* YHResignRiskWarningAlertView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignRiskWarningAlertView.swift
;
sourceTree
=
"<group>"
;
};
04912F612CB66E6300CC3105
/* YHResign
InfoConfirmViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignInfoConfirm
ViewController.swift
;
sourceTree
=
"<group>"
;
};
04912F612CB66E6300CC3105
/* YHResign
ConfirmInfoListViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignConfirmInfoList
ViewController.swift
;
sourceTree
=
"<group>"
;
};
04912F632CB6885D00CC3105
/* YHResignFamilyMemberInfoCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignFamilyMemberInfoCell.swift
;
sourceTree
=
"<group>"
;
};
04912F6D2CB6A64700CC3105
/* YHResignAppointSubmitTipsView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignAppointSubmitTipsView.swift
;
sourceTree
=
"<group>"
;
};
04912F6F2CB765FE00CC3105
/* YHResignAppointTimeViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHResignAppointTimeViewController.swift
;
sourceTree
=
"<group>"
;
};
...
...
@@ -3538,7 +3544,8 @@
04912F572CB6678300CC3105
/* C */
=
{
isa
=
PBXGroup
;
children
=
(
04912F612CB66E6300CC3105
/* YHResignInfoConfirmViewController.swift */
,
04912F612CB66E6300CC3105
/* YHResignConfirmInfoListViewController.swift */
,
044E31CA2CBD336800500F8E
/* YHResignInfoConfirmModifyViewController.swift */
,
);
path
=
C
;
sourceTree
=
"<group>"
;
...
...
@@ -3555,6 +3562,7 @@
04912F592CB6679E00CC3105
/* M */
=
{
isa
=
PBXGroup
;
children
=
(
044E31C62CBD264D00500F8E
/* YHResignInfoConfirmInfoListModel.swift */
,
);
path
=
M
;
sourceTree
=
"<group>"
;
...
...
@@ -3562,6 +3570,7 @@
04912F5A2CB667A700CC3105
/* VM */
=
{
isa
=
PBXGroup
;
children
=
(
044E31C82CBD2AA400500F8E
/* YHResignInfoConfirmIViewModel.swift */
,
);
path
=
VM
;
sourceTree
=
"<group>"
;
...
...
@@ -5494,6 +5503,7 @@
04CA2C052CB8F75700F36DE7
/* YHResignUploadDocListViewModel.swift in Sources */
,
A5ACE9512B4564F7002C94D2
/* YhConstant.swift in Sources */
,
04FD85662C2124AF00BEF9C5
/* YHNameCardViewController.swift in Sources */
,
044E31C72CBD264D00500F8E
/* YHResignInfoConfirmInfoListModel.swift in Sources */
,
0430E63B2C6DA106000511E2
/* CGFloat+Extention.swift in Sources */
,
045EEF192B9F171A0022A143
/* YHAddressModel.swift in Sources */
,
045EEEDB2B9F171A0022A143
/* YHCollegeSearchViewController.swift in Sources */
,
...
...
@@ -5694,10 +5704,11 @@
045EEE9A2B9F171A0022A143
/* YHWorkIntroductionViewModel.swift in Sources */
,
0449EEEB2C8EF2B700A397FD
/* YHResignMaterialListVC.swift in Sources */
,
044D0C1C2C22C30B00C5CF5E
/* YHEditSchoolViewController.swift in Sources */
,
044E31C92CBD2AA400500F8E
/* YHResignInfoConfirmIViewModel.swift in Sources */
,
A5CA3F562C74850200EB22F5
/* YHUploadCertificateDetailVC.swift in Sources */
,
A5ACE9532B4564F7002C94D2
/* YHBaseViewController.swift in Sources */
,
044F39422CB7CCBB007CA277
/* YHVisaRenewalTroubleshootingGuideHeaderCell.swift in Sources */
,
04912F622CB66E6300CC3105
/* YHResign
InfoConfirm
ViewController.swift in Sources */
,
04912F622CB66E6300CC3105
/* YHResign
ConfirmInfoList
ViewController.swift in Sources */
,
04EFC8E92C903F1100FC680F
/* YHResignMaterialViewModel.swift in Sources */
,
04256DE82C7314B500A37BA4
/* YHSelectApplicantCell.swift in Sources */
,
045EEE9D2B9F171A0022A143
/* YHWorkItemListViewModel.swift in Sources */
,
...
...
@@ -5845,6 +5856,7 @@
04CA2C292CBA45ED00F36DE7
/* YHLookResignResultStateThreeTableViewCell.swift in Sources */
,
A567E5AF2BD7643D00D5D5A0
/* YHHomeWebViewBottomForSavePicView.swift in Sources */
,
045A7E672C2ACB1A008F995B
/* YHLoginOneLeadView.swift in Sources */
,
044E31CB2CBD336800500F8E
/* YHResignInfoConfirmModifyViewController.swift in Sources */
,
048787D72BCE96F50036E221
/* YHServiceOrderProgressTableViewCell.swift in Sources */
,
04912F742CB7743900CC3105
/* YHResignAppointSelectTimeItemView.swift in Sources */
,
047AA3F82C5CC7B0009C4554
/* YHShareStepView.swift in Sources */
,
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @
907e251e
...
...
@@ -207,6 +207,9 @@ class YHServiceOrderListView: YHBaseViewController {
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
type
==
33
{
//续签信息确认
let
vc
=
YHResignConfirmInfoListViewController
()
vc
.
stepId
=
stepId
UIViewController
.
current
?
.
navigationController
?
.
pushViewController
(
vc
)
}
else
if
type
==
34
{
//在港递交预约
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/C/YHResign
InfoConfirm
ViewController.swift
→
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/C/YHResign
ConfirmInfoList
ViewController.swift
View file @
907e251e
...
...
@@ -9,10 +9,13 @@
import
UIKit
import
AttributedString
class
YHResignInfoConfirmViewController
:
YHBaseViewController
{
class
YHResignConfirmInfoListViewController
:
YHBaseViewController
{
var
stepId
:
Int
=
0
// 批次ID
var
familyArr
=
[
YHResignInfoConfirmFamilyInfoModel
]()
let
viewModel
=
YHResignInfoConfirmViewModel
()
// YHApplicantInfoModel
var
familyArr
:
[
String
]
=
[
""
,
""
,
""
,
""
]
lazy
var
tableView
:
UITableView
=
{
let
tableView
=
UITableView
(
frame
:
CGRect
.
zero
,
style
:
.
grouped
)
if
#available(iOS 15.0, *)
{
...
...
@@ -86,12 +89,18 @@ class YHResignInfoConfirmViewController: YHBaseViewController {
}
}
override
func
viewWillAppear
(
_
animated
:
Bool
)
{
super
.
viewWillAppear
(
animated
)
requestList
()
}
@objc
func
didBottomBtnClicked
()
{
// 风险弹窗
YHResignRiskWarningAlertView
.
alertView
()
.
show
()
}
}
extension
YHResign
InfoConfirm
ViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
extension
YHResign
ConfirmInfoList
ViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
func
tableView
(
_
tableView
:
UITableView
,
numberOfRowsInSection
section
:
Int
)
->
Int
{
return
familyArr
.
count
...
...
@@ -103,6 +112,7 @@ extension YHResignInfoConfirmViewController: UITableViewDelegate, UITableViewDat
if
0
<=
indexPath
.
row
&&
indexPath
.
row
<
familyArr
.
count
{
let
model
=
familyArr
[
indexPath
.
row
]
cell
.
updateModel
(
model
)
cell
.
updateLineMargin
(
indexPath
.
row
==
0
?
0.0
:
18.0
)
if
indexPath
.
row
==
familyArr
.
count
-
1
{
let
corner
=
UIRectCorner
(
rawValue
:
UIRectCorner
.
bottomLeft
.
rawValue
|
UIRectCorner
.
bottomRight
.
rawValue
)
...
...
@@ -159,3 +169,15 @@ extension YHResignInfoConfirmViewController: UITableViewDelegate, UITableViewDat
}
}
extension
YHResignConfirmInfoListViewController
{
func
requestList
()
{
YHHUD
.
show
(
.
progress
(
message
:
"加载中..."
))
self
.
viewModel
.
getList
(
id
:
stepId
)
{
success
,
error
in
YHHUD
.
hide
()
self
.
familyArr
.
removeAll
()
self
.
familyArr
.
append
(
contentsOf
:
self
.
viewModel
.
getList
())
self
.
tableView
.
reloadData
()
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/C/YHResignInfoConfirmModifyViewController.swift
0 → 100644
View file @
907e251e
//
// YHResignInfoConfirmModifyViewController.swift
// galaxy
//
// Created by edy on 2024/10/14.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
class
YHResignInfoConfirmModifyViewController
:
YHBaseViewController
{
var
stepId
:
Int
=
0
// 批次ID
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/M/YHResignInfoConfirmInfoListModel.swift
0 → 100644
View file @
907e251e
//
// YHResignInfoConfirmInfoListModel.swift
// galaxy
//
// Created by edy on 2024/10/14.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
import
SmartCodable
class
YHResignInfoConfirmInfoListModel
:
SmartCodable
{
var
id
:
Int
=
0
var
main
:
YHResignInfoConfirmFamilyInfoModel
?
var
spouse
:
YHResignInfoConfirmFamilyInfoModel
?
var
children
:
[
YHResignInfoConfirmFamilyInfoModel
]
=
[]
enum
CodingKeys
:
String
,
CodingKey
{
case
id
=
"id"
case
main
=
"main"
case
spouse
=
"spouse"
case
children
=
"children"
}
required
init
()
{
}
init
(
id
:
Int
,
main
:
YHResignInfoConfirmFamilyInfoModel
,
spouse
:
YHResignInfoConfirmFamilyInfoModel
,
children
:
[
YHResignInfoConfirmFamilyInfoModel
])
{
self
.
id
=
id
self
.
main
=
main
self
.
spouse
=
spouse
self
.
children
=
children
}
}
class
YHResignInfoConfirmFamilyInfoModel
:
SmartCodable
{
var
info
:
YHResignInfoConfirmFamilyModel
=
YHResignInfoConfirmFamilyModel
()
var
confirmStatus
:
Int
=
0
enum
CodingKeys
:
String
,
CodingKey
{
case
info
=
"info"
case
confirmStatus
=
"confirm_status"
}
required
init
()
{
}
init
(
info
:
YHResignInfoConfirmFamilyModel
,
confirmStatus
:
Int
)
{
self
.
info
=
info
self
.
confirmStatus
=
confirmStatus
}
}
class
YHResignConfirmIdentityModel
:
SmartCodable
{
var
type
:
Int
=
-
1
var
name
:
String
=
""
var
number
:
String
=
""
var
begin
:
String
=
""
var
end
:
String
=
""
required
init
()
{
}
enum
CodingKeys
:
String
,
CodingKey
{
case
type
=
"type"
case
name
=
"name"
case
number
=
"number"
case
begin
=
"begin"
case
end
=
"end"
}
init
(
type
:
Int
,
name
:
String
,
number
:
String
,
begin
:
String
,
end
:
String
)
{
self
.
type
=
type
self
.
name
=
name
self
.
number
=
number
self
.
begin
=
begin
self
.
end
=
end
}
}
// MARK: - Info
class
YHResignInfoConfirmFamilyModel
:
SmartCodable
{
var
id
:
Int
=
-
1
var
name
:
String
=
""
var
nameHistory
:
String
=
""
var
familyName
:
String
=
""
var
familyNameHistory
:
String
=
""
var
givenName
:
String
=
""
var
givenNameHistory
:
String
=
""
var
married
:
String
=
""
var
marriedHistory
:
String
=
""
var
nationalityType
:
Int
=
-
1
var
nationalityTypeHistory
:
Int
=
-
1
var
nationality
:
String
=
""
var
nationalityHistory
:
String
=
""
var
hkIdentityid
:
String
=
""
var
hkIdentityidHistory
:
String
=
""
var
identity
:
YHResignConfirmIdentityModel
?
var
occupationName
:
String
=
""
var
occupationNameHistory
:
String
=
""
var
hkAddress
:
String
=
""
var
hkAddressHistory
:
String
=
""
// 自定义属性
var
relation
:
Int
=
YHFamilyMemberRelationType
.
none
.
rawValue
// 是否检测编辑字段
var
isCheck
:
Bool
=
false
required
init
()
{
}
func
getRelation
()
->
String
{
if
relation
==
YHFamilyMemberRelationType
.
mainApplicant
.
rawValue
{
return
"主申人"
}
else
if
relation
==
YHFamilyMemberRelationType
.
spouse
.
rawValue
{
return
"配偶"
}
else
if
relation
==
YHFamilyMemberRelationType
.
child
.
rawValue
{
return
"子女"
}
return
""
}
enum
CodingKeys
:
String
,
CodingKey
{
case
id
=
"id"
case
name
=
"name"
case
nameHistory
=
"name_history"
case
familyName
=
"family_name"
case
familyNameHistory
=
"family_name_history"
case
givenName
=
"given_name"
case
givenNameHistory
=
"given_name_history"
case
married
=
"married"
case
marriedHistory
=
"married_history"
case
nationalityType
=
"nationality_type"
case
nationalityTypeHistory
=
"nationality_type_history"
case
nationality
=
"nationality"
case
nationalityHistory
=
"nationality_history"
case
hkIdentityid
=
"hk_identity_id"
case
hkIdentityidHistory
=
"hk_identity_id_history"
case
identity
=
"identity"
case
occupationName
=
"occupation_name"
case
occupationNameHistory
=
"occupation_name_history"
case
hkAddress
=
"hk_address"
case
hkAddressHistory
=
"hk_address_history"
}
init
(
id
:
Int
,
name
:
String
,
nameHistory
:
String
,
familyName
:
String
,
familyNameHistory
:
String
,
givenName
:
String
,
givenNameHistory
:
String
,
married
:
String
,
marriedHistory
:
String
,
nationalityType
:
Int
,
nationalityTypeHistory
:
Int
,
nationality
:
String
,
nationalityHistory
:
String
,
hkIdentityid
:
String
,
hkIdentityidHistory
:
String
,
identity
:
YHResignConfirmIdentityModel
,
occupationName
:
String
,
occupationNameHistory
:
String
,
hkAddress
:
String
,
hkAddressHistory
:
String
)
{
self
.
id
=
id
self
.
name
=
name
self
.
nameHistory
=
nameHistory
self
.
familyName
=
familyName
self
.
familyNameHistory
=
familyNameHistory
self
.
givenName
=
givenName
self
.
givenNameHistory
=
givenNameHistory
self
.
married
=
married
self
.
marriedHistory
=
marriedHistory
self
.
nationalityType
=
nationalityType
self
.
nationalityTypeHistory
=
nationalityTypeHistory
self
.
nationality
=
nationality
self
.
nationalityHistory
=
nationalityHistory
self
.
hkIdentityid
=
hkIdentityid
self
.
hkIdentityidHistory
=
hkIdentityidHistory
self
.
identity
=
identity
self
.
occupationName
=
occupationName
self
.
occupationNameHistory
=
occupationNameHistory
self
.
hkAddress
=
hkAddress
self
.
hkAddressHistory
=
hkAddressHistory
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/V/YHResignFamilyMemberInfoCell.swift
View file @
907e251e
...
...
@@ -12,7 +12,7 @@ class YHResignFamilyMemberInfoCell: UITableViewCell {
static
let
cellReuseIdentifier
=
"YHResignFamilyMemberInfoCell"
func
updateModel
(
_
model
:
YH
Applicant
InfoModel
)
{
func
updateModel
(
_
model
:
YH
ResignInfoConfirmFamily
InfoModel
)
{
self
.
relationLabel
.
text
=
model
.
info
.
getRelation
()
self
.
nameLabel
.
text
=
model
.
info
.
name
self
.
pinyinLabel
.
text
=
"
\(
model
.
info
.
familyName
)
\(
model
.
info
.
givenName
)
"
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/VM/YHResignInfoConfirmIViewModel.swift
0 → 100644
View file @
907e251e
//
// YHResignInfoConfirmIViewModel.swift
// galaxy
//
// Created by edy on 2024/10/14.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
class
YHResignInfoConfirmViewModel
{
var
listModel
=
YHResignInfoConfirmInfoListModel
()
func
getList
(
id
:
Int
,
callBack
:
@escaping
(
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
())
{
let
params
=
[
"id"
:
id
]
let
strUrl
=
YHBaseUrlManager
.
shared
.
curURL
()
+
YHAllApiName
.
ResignInfoConfirm
.
getList
let
_
=
YHNetRequest
.
getRequest
(
url
:
strUrl
,
params
:
params
)
{
[
weak
self
]
json
,
code
in
//1. json字符串 转 对象
guard
let
self
=
self
else
{
return
}
if
json
.
code
==
200
{
guard
let
dic
=
json
.
data
?
.
peel
as?
[
String
:
Any
],
let
resultModel
=
YHResignInfoConfirmInfoListModel
.
deserialize
(
from
:
dic
)
else
{
let
err
=
YHErrorModel
(
errorCode
:
YHErrorCode
.
dictParseError
.
rawValue
,
errorMsg
:
YHErrorCode
.
dictParseError
.
description
())
callBack
(
false
,
err
)
return
}
self
.
listModel
=
resultModel
callBack
(
true
,
nil
)
}
else
{
let
err
=
YHErrorModel
(
errorCode
:
Int32
(
json
.
code
),
errorMsg
:
json
.
msg
.
isEmpty
?
""
:
json
.
msg
)
self
.
listModel
=
YHResignInfoConfirmInfoListModel
()
callBack
(
false
,
err
)
}
}
failBlock
:
{
err
in
self
.
listModel
=
YHResignInfoConfirmInfoListModel
()
callBack
(
false
,
err
)
}
}
func
getList
()
->
[
YHResignInfoConfirmFamilyInfoModel
]
{
var
results
=
[
YHResignInfoConfirmFamilyInfoModel
]()
if
let
main
=
self
.
listModel
.
main
{
main
.
info
.
relation
=
YHFamilyMemberRelationType
.
mainApplicant
.
rawValue
results
.
append
(
main
)
}
if
let
spouse
=
listModel
.
spouse
{
spouse
.
info
.
relation
=
YHFamilyMemberRelationType
.
spouse
.
rawValue
results
.
append
(
spouse
)
}
for
child
in
listModel
.
children
{
child
.
info
.
relation
=
YHFamilyMemberRelationType
.
child
.
rawValue
results
.
append
(
child
)
}
return
results
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @
907e251e
...
...
@@ -565,6 +565,13 @@ class YHAllApiName {
static
let
confirmInHK
=
"super-app/renewal/confirm-stay-hk"
}
// 续签信息确认
struct
ResignInfoConfirm
{
static
let
getList
=
"super-app/renewal/information-list"
static
let
confirmInfo
=
"super-app/renewal/information-confirm"
static
let
upate
=
"super-app/renewal/information-update"
}
// 在港记录
struct
HKImmigrationRecords
{
// 在港记录-汇总
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment