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
028d8c27
Commit
028d8c27
authored
Feb 05, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into duyu
parents
8a93d915
7655f492
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
324 additions
and
49 deletions
+324
-49
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+24
-0
YHBasicInfoFillViewController.swift
...seInformation(基本资料)/C/YHBasicInfoFillViewController.swift
+15
-7
YHBasicInfoCellModel.swift
...ss(流程)/BaseInformation(基本资料)/M/YHBasicInfoCellModel.swift
+20
-0
YHBasicInfoFillModel.swift
...ss(流程)/BaseInformation(基本资料)/M/YHBasicInfoFillModel.swift
+79
-0
YHBasicInfoSessionModel.swift
...流程)/BaseInformation(基本资料)/M/YHBasicInfoSessionModel.swift
+18
-0
YHBasicInfoFillCell.swift
...ess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillCell.swift
+68
-39
YHBasicInfoFillView.swift
...ess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillView.swift
+30
-2
YHBasicInfoFillViewModel.swift
...)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift
+69
-0
YHNetRequest.swift
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
+1
-1
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
028d8c27
...
...
@@ -83,6 +83,10 @@
A5234E2A2B6E349600A33433
/* YHBasicInfoFillBottomView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5234E292B6E349600A33433
/* YHBasicInfoFillBottomView.swift */
;
};
A5234E2C2B6E3BA400A33433
/* YHBasicInfoFillCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5234E2B2B6E3BA400A33433
/* YHBasicInfoFillCell.swift */
;
};
A5234E2E2B6E43EA00A33433
/* YHBasicInfoFillView.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5234E2D2B6E43EA00A33433
/* YHBasicInfoFillView.swift */
;
};
A5234E312B6F9C5E00A33433
/* YHBasicInfoFillViewModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5234E302B6F9C5D00A33433
/* YHBasicInfoFillViewModel.swift */
;
};
A5234E332B6F9CB700A33433
/* YHBasicInfoFillModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5234E322B6F9CB700A33433
/* YHBasicInfoFillModel.swift */
;
};
A5234E352B707F6B00A33433
/* YHBasicInfoSessionModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5234E342B707F6B00A33433
/* YHBasicInfoSessionModel.swift */
;
};
A5234E372B70802400A33433
/* YHBasicInfoCellModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5234E362B70802300A33433
/* YHBasicInfoCellModel.swift */
;
};
A53026902B4E6F2700F35102
/* YHHomeCustomCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A530268F2B4E6F2700F35102
/* YHHomeCustomCell.swift */
;
};
A5551FFE2B4C26CE00510980
/* YHBaseViewModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5551FFD2B4C26CE00510980
/* YHBaseViewModel.swift */
;
};
A5573ED22B317BFF00D98EC0
/* AppDelegate.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
A5573ED12B317BFF00D98EC0
/* AppDelegate.swift */
;
};
...
...
@@ -305,6 +309,10 @@
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>"
;
};
A5234E2D2B6E43EA00A33433
/* YHBasicInfoFillView.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHBasicInfoFillView.swift
;
sourceTree
=
"<group>"
;
};
A5234E302B6F9C5D00A33433
/* YHBasicInfoFillViewModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHBasicInfoFillViewModel.swift
;
sourceTree
=
"<group>"
;
};
A5234E322B6F9CB700A33433
/* YHBasicInfoFillModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHBasicInfoFillModel.swift
;
sourceTree
=
"<group>"
;
};
A5234E342B707F6B00A33433
/* YHBasicInfoSessionModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHBasicInfoSessionModel.swift
;
sourceTree
=
"<group>"
;
};
A5234E362B70802300A33433
/* YHBasicInfoCellModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHBasicInfoCellModel.swift
;
sourceTree
=
"<group>"
;
};
A530268F2B4E6F2700F35102
/* YHHomeCustomCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHHomeCustomCell.swift
;
sourceTree
=
"<group>"
;
};
A5551FFD2B4C26CE00510980
/* YHBaseViewModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
YHBaseViewModel.swift
;
sourceTree
=
"<group>"
;
};
A5573ECE2B317BFF00D98EC0
/* galaxy.app */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.application
;
includeInIndex
=
0
;
path
=
galaxy.app
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
...
...
@@ -757,6 +765,14 @@
path
=
C
;
sourceTree
=
"<group>"
;
};
A5234E2F2B6F9C0900A33433
/* VM */
=
{
isa
=
PBXGroup
;
children
=
(
A5234E302B6F9C5D00A33433
/* YHBasicInfoFillViewModel.swift */
,
);
path
=
VM
;
sourceTree
=
"<group>"
;
};
A5573EC52B317BFF00D98EC0
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -810,6 +826,7 @@
A58556BB2B6BD81C003746B2
/* BaseInformation(基本资料) */
=
{
isa
=
PBXGroup
;
children
=
(
A5234E2F2B6F9C0900A33433
/* VM */
,
A58556BC2B6BD84C003746B2
/* M */
,
A58556BD2B6BD85A003746B2
/* V */
,
A58556BE2B6BD85E003746B2
/* C */
,
...
...
@@ -820,6 +837,9 @@
A58556BC2B6BD84C003746B2
/* M */
=
{
isa
=
PBXGroup
;
children
=
(
A5234E322B6F9CB700A33433
/* YHBasicInfoFillModel.swift */
,
A5234E342B707F6B00A33433
/* YHBasicInfoSessionModel.swift */
,
A5234E362B70802300A33433
/* YHBasicInfoCellModel.swift */
,
);
path
=
M
;
sourceTree
=
"<group>"
;
...
...
@@ -1422,11 +1442,13 @@
A58556C22B6C8412003746B2
/* YHScoreResultModel.swift in Sources */
,
0468D47A2B68A08600CFB916
/* YHAddressPickViewTableViewCell.swift in Sources */
,
0468D4342B56587B00CFB916
/* YHOSSManager.swift in Sources */
,
A5234E372B70802400A33433
/* YHBasicInfoCellModel.swift in Sources */
,
A5C382D12B5FAAB300C5E65C
/* YHContactItemModel.swift in Sources */
,
A5FD63EF2B68902400D1D9DA
/* YHPersonInfoCellView.swift in Sources */
,
A5ACE9522B4564F7002C94D2
/* YHServiceCenterMainViewController.swift in Sources */
,
A5C5B2FD2B55361700A7C5D1
/* YHBannerModel.swift in Sources */
,
A5ACE9462B4564F7002C94D2
/* YHHUDSquareBaseView.swift in Sources */
,
A5234E332B6F9CB700A33433
/* YHBasicInfoFillModel.swift in Sources */
,
A5551FFE2B4C26CE00510980
/* YHBaseViewModel.swift in Sources */
,
A5C5B2F92B5515CE00A7C5D1
/* YHPageContentView.swift in Sources */
,
A5C382CA2B5E1F4C00C5E65C
/* YHLoginTipsView.swift in Sources */
,
...
...
@@ -1458,6 +1480,8 @@
A5FD63D82B6603A500D1D9DA
/* YHScoreResultView.swift in Sources */
,
A5ACE9342B4564F7002C94D2
/* YHAllApiName.swift in Sources */
,
A5ACE9502B4564F7002C94D2
/* YhCacheTool.swift in Sources */
,
A5234E352B707F6B00A33433
/* YHBasicInfoSessionModel.swift in Sources */
,
A5234E312B6F9C5E00A33433
/* YHBasicInfoFillViewModel.swift in Sources */
,
0468D4862B6A41F300CFB916
/* YHMainInformationModel.swift in Sources */
,
0468D4242B494BEA00CFB916
/* YHCodeResultViewController.swift in Sources */
,
A5FD63EA2B67D95100D1D9DA
/* YHFamilyMemberViewController.swift in Sources */
,
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift
View file @
028d8c27
...
...
@@ -14,7 +14,7 @@ import GKNavigationBarSwift
class
YHBasicInfoFillViewController
:
YHBaseViewController
{
var
orderId
:
Int
?
private
let
serviceCenterMainReqVM
:
YHServiceCenterMainViewModel
=
YHServiceCenterMain
ViewModel
()
private
let
basicInfoVM
:
YHBasicInfoFillViewModel
=
YHBasicInfoFill
ViewModel
()
var
homeTableView
:
UITableView
=
{
let
tableView
=
UITableView
(
frame
:
.
zero
,
style
:
.
grouped
)
tableView
.
backgroundColor
=
.
clear
...
...
@@ -80,7 +80,9 @@ extension YHBasicInfoFillViewController {
private
func
loadData
()
{
guard
let
orderId
=
orderId
else
{
return
}
let
param
=
[
"order_id"
:
orderId
]
basicInfoVM
.
getBasicInfoData
()
homeTableView
.
reloadData
()
// let param = ["order_id":orderId]
// serviceCenterMainReqVM.getMyScoreDetail(params: param) { success, error in
// if success == true {
//
...
...
@@ -98,7 +100,7 @@ extension YHBasicInfoFillViewController {
extension
YHBasicInfoFillViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
func
numberOfSections
(
in
tableView
:
UITableView
)
->
Int
{
return
1
return
basicInfoVM
.
arrBasicInfoSessionDataForEdit
.
count
}
func
tableView
(
_
tableView
:
UITableView
,
numberOfRowsInSection
section
:
Int
)
->
Int
{
...
...
@@ -108,11 +110,13 @@ extension YHBasicInfoFillViewController : UITableViewDelegate,UITableViewDataSou
func
tableView
(
_
tableView
:
UITableView
,
heightForHeaderInSection
section
:
Int
)
->
CGFloat
{
return
0
return
15
}
func
tableView
(
_
tableView
:
UITableView
,
viewForHeaderInSection
section
:
Int
)
->
UIView
?
{
return
UIView
()
let
view
=
UIView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
tableView
.
bounds
.
width
,
height
:
15
))
view
.
backgroundColor
=
.
clear
return
view
}
func
tableView
(
_
tableView
:
UITableView
,
heightForFooterInSection
section
:
Int
)
->
CGFloat
{
...
...
@@ -124,8 +128,12 @@ extension YHBasicInfoFillViewController : UITableViewDelegate,UITableViewDataSou
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
let
cell
=
tableView
.
dequeueReusableCell
(
withClass
:
YHBasicInfoFillCell
.
self
)
cell
.
block
=
{
tableView
.
reloadData
()
cell
.
dataModel
=
basicInfoVM
.
arrBasicInfoSessionDataForEdit
[
indexPath
.
section
]
cell
.
indexPath
=
indexPath
cell
.
block
=
{
indexPath
in
if
let
indexPath
=
indexPath
{
tableView
.
reloadRows
(
at
:
[
indexPath
],
with
:
.
none
)
}
}
return
cell
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/M/YHBasicInfoCellModel.swift
0 → 100644
View file @
028d8c27
//
// YHBasicInfoCellModel.swift
// galaxy
//
// Created by davidhuangA on 2024/2/5.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
class
YHBasicInfoCellModel
{
var
question
:
String
=
""
var
answer
:
String
=
""
var
additionDes
:
String
=
""
init
(
question
:
String
,
answer
:
String
,
additionDes
:
String
)
{
self
.
question
=
question
self
.
answer
=
answer
self
.
additionDes
=
additionDes
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/M/YHBasicInfoFillModel.swift
0 → 100644
View file @
028d8c27
//
// YHBasicInfoFillModel.swift
// galaxy
//
// Created by davidhuangA on 2024/2/4.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
import
SmartCodable
class
YHBasicInfoFillModel
:
SmartCodable
{
var
applicant
:
ApplicantModel
?
var
spouse
:
SpouseModel
?
var
child
:
[
SpouseModel
]?
var
brother
:
[
SpouseModel
]?
var
background
:
backgroundModel
?
var
orderID
:
String
=
""
required
init
()
{
}
}
class
backgroundModel
:
SmartCodable
{
var
subset
:
[
subsetModel
]
=
[]
var
background_member
:
background_memberModel
?
required
init
()
{
}
}
class
subsetModel
:
SmartCodable
{
var
id
:
Int
=
0
var
subset_name
:
String
=
""
required
init
()
{
}
}
class
background_memberModel
:
SmartCodable
{
var
has
:
String
=
""
var
info
:
String
=
""
required
init
()
{
}
}
class
SpouseModel
:
SmartCodable
{
var
id
:
Int
=
0
var
subset_name
:
String
=
""
var
child_departure
:
background_memberModel
?
var
child_deny
:
background_memberModel
?
required
init
()
{
}
}
class
ApplicantModel
:
SmartCodable
{
var
id
:
Int
=
0
var
has_conviction
:
background_memberModel
?
var
has_departure
:
background_memberModel
?
var
has_deny
:
background_memberModel
?
var
has_breaking_law
:
background_memberModel
?
var
has_other_id
:
background_memberModel
?
required
init
()
{
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/M/YHBasicInfoSessionModel.swift
0 → 100644
View file @
028d8c27
//
// YHBasicInfoSessionModel.swift
// galaxy
//
// Created by davidhuangA on 2024/2/5.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
class
YHBasicInfoSessionModel
{
var
sessionTitle
:
String
=
""
var
arrQuestionItem
:
[
YHBasicInfoCellModel
]
=
[]
init
(
sessionTitle
:
String
,
arrQuestionItem
:
[
YHBasicInfoCellModel
])
{
self
.
sessionTitle
=
sessionTitle
self
.
arrQuestionItem
=
arrQuestionItem
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillCell.swift
View file @
028d8c27
...
...
@@ -10,73 +10,102 @@ import UIKit
class
YHBasicInfoFillCell
:
UITableViewCell
{
static
let
cellReuseIdentifier
=
"YHBasicInfoFillCell"
// var arrData : [YHBasicInfoSessionModel]? {
// didSet {
// updateUI()
// }
// }
var
dataModel
:
YHBasicInfoSessionModel
?
{
didSet
{
updateUI
()
}
}
var
indexPath
:
IndexPath
?
override
init
(
style
:
UITableViewCell
.
CellStyle
,
reuseIdentifier
:
String
?)
{
super
.
init
(
style
:
style
,
reuseIdentifier
:
reuseIdentifier
)
selectionStyle
=
.
none
updateUI
()
}
required
init
?(
coder
:
NSCoder
)
{
fatalError
(
"init(coder:) has not been implemented"
)
}
let
view0
=
YHBasicInfoFillView
()
let
view1
=
YHBasicInfoFillView
()
typealias
Block
=
()
->
()
required
init
?(
coder
:
NSCoder
)
{
fatalError
(
"init(coder:) has not been implemented"
)
}
typealias
Block
=
(
IndexPath
?)
->
()
var
block
:
Block
?
}
extension
YHBasicInfoFillCell
{
func
updateUI
()
{
guard
let
dataModel
=
dataModel
else
{
return
}
contentView
.
removeSubviews
()
//主申请人
let
holdView1
=
UIView
()
holdView1
.
backgroundColor
=
.
white
holdView1
.
layer
.
cornerRadius
=
kCornerRadius6
holdView1
.
clipsToBounds
=
true
contentView
.
addSubview
(
holdView1
)
holdView1
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalToSuperview
()
make
.
left
.
right
.
equalToSuperview
()
make
.
bottom
.
equalToSuperview
()
}
do
{
let
sessionView
=
YHPersonInfoSessionView
()
sessionView
.
updateTitle
(
title
:
"主申请人"
)
holdView1
.
addSubview
(
sessionView
)
sessionView
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
make
.
height
.
equalTo
(
YHPersonInfoSessionView
.
viewH
)
let
sessionView
=
YHPersonInfoSessionView
()
sessionView
.
updateTitle
(
title
:
dataModel
.
sessionTitle
)
holdView1
.
addSubview
(
sessionView
)
sessionView
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalToSuperview
()
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
make
.
height
.
equalTo
(
YHPersonInfoSessionView
.
viewH
)
}
let
arrQ
=
dataModel
.
arrQuestionItem
var
tmpView
:
UIView
=
sessionView
for
(
index0
,
question
)
in
arrQ
.
enumerated
()
{
let
view
=
YHBasicInfoFillView
()
view
.
block
=
{
self
.
block
?(
self
.
indexPath
)
}
view
.
model
=
question
holdView1
.
addSubview
(
view
)
holdView1
.
addSubview
(
view0
)
view0
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
sessionView
.
snp
.
bottom
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
if
arrQ
.
count
==
1
{
view
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
tmpView
.
snp
.
bottom
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
make
.
bottom
.
equalToSuperview
()
}
}
else
{
if
index0
==
arrQ
.
count
-
1
{
view
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
tmpView
.
snp
.
bottom
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
make
.
bottom
.
equalToSuperview
()
}
}
else
{
view
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
tmpView
.
snp
.
bottom
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
}
}
}
view0
.
block
=
{
self
.
block
?()
}
holdView1
.
addSubview
(
view1
)
view1
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
view0
.
snp
.
bottom
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
make
.
bottom
.
equalToSuperview
()
}
view1
.
block
=
{
self
.
block
?()
}
tmpView
=
view
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillView.swift
View file @
028d8c27
...
...
@@ -80,7 +80,6 @@ class YHBasicInfoFillView: UIView {
private
lazy
var
bottomLine
:
UIView
=
{
let
view
=
UIView
()
view
.
backgroundColor
=
UIColor
(
hex
:
0xF0F0F0
)
// view.backgroundColor = .red //for test hjl
return
view
}()
...
...
@@ -97,7 +96,7 @@ class YHBasicInfoFillView: UIView {
var
title
:
String
?
{
didSet
{
if
let
question
=
title
{
let
str
=
"*"
+
question
let
str
=
"*
"
+
question
let
attributes
:
[
NSAttributedString
.
Key
:
Any
]
=
[
.
font
:
UIFont
.
PFSC_R
(
ofSize
:
14
),
.
foregroundColor
:
UIColor
.
mainTextColor
...
...
@@ -109,6 +108,14 @@ class YHBasicInfoFillView: UIView {
}
}
}
var
model
:
YHBasicInfoCellModel
?
{
didSet
{
updateUI
()
}
}
}
...
...
@@ -168,6 +175,8 @@ private extension YHBasicInfoFillView {
additionHoldView
.
isHidden
=
true
bottomLine
.
isHidden
=
false
model
?
.
answer
=
"N"
}
else
{
answer1Btn
.
isSelected
=
false
updateAnswerButton
(
answer1Btn
,
false
)
...
...
@@ -180,10 +189,17 @@ private extension YHBasicInfoFillView {
make
.
bottom
.
equalToSuperview
()
.
offset
(
-
18
)
}
model
?
.
answer
=
"Y"
additionHoldView
.
isHidden
=
false
bottomLine
.
isHidden
=
true
}
additionHoldView
.
layoutIfNeeded
()
bottomLine
.
layoutIfNeeded
()
block
?()
}
...
...
@@ -195,4 +211,16 @@ private extension YHBasicInfoFillView {
btn
.
setTitleColor
((
isSelect
?
btnTitleSelectColor
:
btnTitleDefaultColor
),
for
:
.
normal
)
btn
.
backgroundColor
=
(
isSelect
?
btnBgSelectColor
:
btnBgDefaultColor
)
}
private
func
updateUI
()
{
guard
let
model
=
model
else
{
return
}
title
=
model
.
question
if
model
.
answer
==
"Y"
{
didClickResponseBtn
(
btn
:
answer2Btn
)
}
else
{
if
model
.
answer
==
"N"
{
didClickResponseBtn
(
btn
:
answer1Btn
)
}
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift
0 → 100644
View file @
028d8c27
//
// YHBasicInfoFillViewModel.swift
// galaxy
//
// Created by davidhuangA on 2024/2/4.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import
UIKit
class
YHBasicInfoFillViewModel
:
YHBaseViewModel
{
var
arrBasicInfoSessionDataForEdit
:
[
YHBasicInfoSessionModel
]
=
[]
}
extension
YHBasicInfoFillViewModel
{
func
getBasicInfoData
()
{
//session1
var
arrData
:
[
YHBasicInfoSessionModel
]
=
[]
do
{
//主申请人
let
model1
=
YHBasicInfoCellModel
(
question
:
"1、是否曾在香港或其他地方因任何罪行或违法行为被定罪?"
,
answer
:
"N"
,
additionDes
:
""
)
let
model2
=
YHBasicInfoCellModel
(
question
:
"2、是否曾在香港或其他地方被拒入境/递解/遣送或要求离境?"
,
answer
:
"Y"
,
additionDes
:
""
)
let
model3
=
YHBasicInfoCellModel
(
question
:
"3、是否曾被拒绝签发香港或其他地方的签证/进入许可?"
,
answer
:
"N"
,
additionDes
:
""
)
let
model4
=
YHBasicInfoCellModel
(
question
:
"4、是否曾触犯香港或任何地方的入境法例?"
,
answer
:
""
,
additionDes
:
"N"
)
let
model5
=
YHBasicInfoCellModel
(
question
:
"5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港?"
,
answer
:
""
,
additionDes
:
""
)
let
arr
=
[
model1
,
model2
,
model3
,
model4
,
model5
]
let
sessionModel
=
YHBasicInfoSessionModel
(
sessionTitle
:
"主申请人"
,
arrQuestionItem
:
arr
)
arrData
.
append
(
sessionModel
)
}
do
{
//配偶
let
model1
=
YHBasicInfoCellModel
(
question
:
"1、是否曾被拒绝入境/递解/遣送或要求离开香港?"
,
answer
:
""
,
additionDes
:
""
)
let
model2
=
YHBasicInfoCellModel
(
question
:
"2、是否曾被拒绝签发签证/进入许可以入境香港?"
,
answer
:
""
,
additionDes
:
""
)
let
arr
=
[
model1
,
model2
]
let
sessionModel
=
YHBasicInfoSessionModel
(
sessionTitle
:
"配偶"
,
arrQuestionItem
:
arr
)
arrData
.
append
(
sessionModel
)
}
do
{
//子女 - xxx
let
model1
=
YHBasicInfoCellModel
(
question
:
"1、是否曾被拒绝入境/递解/遣送或要求离开香港?"
,
answer
:
"N"
,
additionDes
:
""
)
let
model2
=
YHBasicInfoCellModel
(
question
:
"2、是否曾被拒绝签发签证/进入许可以入境香港?"
,
answer
:
"Y"
,
additionDes
:
""
)
let
arr
=
[
model1
,
model2
]
let
sessionModel
=
YHBasicInfoSessionModel
(
sessionTitle
:
"子女 - xxx"
,
arrQuestionItem
:
arr
)
arrData
.
append
(
sessionModel
)
}
do
{
//家庭背景
let
model1
=
YHBasicInfoCellModel
(
question
:
"1、至少一名直系家庭成员(已婚配偶、父母、兄弟姊妹、子女)是现居于香港的香港永久性居民"
,
answer
:
""
,
additionDes
:
""
)
let
arr
=
[
model1
]
let
sessionModel
=
YHBasicInfoSessionModel
(
sessionTitle
:
"家庭背景"
,
arrQuestionItem
:
arr
)
arrData
.
append
(
sessionModel
)
}
arrBasicInfoSessionDataForEdit
=
arrData
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @
028d8c27
...
...
@@ -93,7 +93,7 @@ class YHNetRequest: NSObject {
print
(
"sign =
\(
sign
)
"
)
requestHeader
.
add
(
name
:
"sign"
,
value
:
sign
)
requestHeader
.
add
(
name
:
"token"
,
value
:
"eyJpdiI6I
lViSTIyb3VvNkVhUjliSFByY0Z3WXc9PSIsInZhbHVlIjoiZEFZbXpWUWlXa2NLcTBLazEzNXlia2VtQ0VXN2h3UjdXMVluZFBZWFwvZjJlbXZ5T1wvUkZcLysrN1ZyRTRoU3FDY3U4ejBUcllkdUo2WUlSRHF3dlhuT3BqVjBTWEI0UkhubStCbE5tcU84dUxZaWxmVWxLXC9tczVBVFhUeW02MmdoSEN6V0w5Y1ViUWsxNmZPK1MxU2RJSEQ3ak9Zak92T2FRdzRVWGphRkRxOXFvaXd2XC9aUjkxRGw0VU1VOGc1U2dXNVpnWmtpQWZCeFwvcVlkbTBKVnNUMzZJUjhTY0dOd25Qc2NuYlRzelZKMG1laGNRY2Vjc3dmdFdCb3VUazFuc0NIbzh1SjJYQWFrWFwvTTFDYnhBNFB6VHJSU0c3XC9mZDZnXC9xQXJaRElYcERGaDQzZzRKTHFpREcyd040OFRpdlpNMm80S1kxZk1nbVJSTVpHWEJtWXFudHVUcm55VWxFb3ZtaFwvS1REYzl4cDFzdUdUT25JckRqblJGUEdERVVIU0JUaVFySDhrdmdWRDNkYlRFbHBqSzhjdkZXMWhBWHRuVG5IbCsxMXFjZWVGM25lNXVjbnNpdGlaYVZlamVUbmZqZkRcL1BzQVVtRUZUR0pCV0RXZjhVajZSMEp5bG5mNVU2c0lZRXQrcm9TaFl6MVUzVjc4VnN3cVF4c3JmYWxJWHBOaG44dFd2bHp6T3AwQkJGN2JcL2V0XC9RTEgyU3RkblM0dFNSeUZuUDQrYzhMZFM5SnlPc25GMzB2d2RiWVlTZXlKa3JlYmRCSlMxd1RYdWRsSzVnaHIrb3d5YnZOZXpvd2RrRTVqS2xyR0xMVjhDQ0J2ZTgyeVdjaWJ3d3puQlUreW5ZM3I5UzlxaDE0VEZHMEdyNE9CUXRtcUpoQzBYWUFYOFRITGhZeVQxSnN6TlpLdm96QmdEYmxFSGtiVnZjT1V2WVQxUHRmNnVnOTlic0VPWHM2dG45Z0toNGpWSTRLXC9CVGQ1RUc2bnpDbStMVnBaa0E3OXFYdFA0YUNSMWdNOUptbThsRHg2Q3YxY25vbjBWWElrQ3ZXT3FlR0VYd2dqRllkeVZzQVI4TzV6Q2wreWhCOHo2WUVxbHZ5S2VIbDdBWmdrTW9CVFkrQXpmaDJkZGN4b1BUMnl2TFFrcjhrU0lFT2VMQkVtOUVLWTBJWEdNbDgzYjlrbDJSQmVYdXJkcGFUNFwvaUduV1VSZzJRRVV2S0tOR3ozYVBwSWlCNHNxaFNZOElNQWNUWVByQ0tQUmFLMjNIRU5yNlZvcnJ3Q1wvTVU0cHkrMkJGdHhBVUVDN1R3K1lBVkd2NHhSVXBlK0pIZEY1THpuRGpcL1o3N0l4ZDgwN1pcL3JhZmpjMzIxd2pFbXFJM1RBOTY0Ykd1TjYwZ3NSZjh5Kzd2cUlHZzJpVTErOUhNSTJxTGQ1cU5NZ2xtekllSnJ2NUZyZjc4MXRjR1d0TG5yOVIxbWtleGJxdGIxTXd3RXdOcU5hamE2YmhJdXk4ZjB6V1VSdWZnZHYxNkQ3SXE0cEY3RUxDUmNXcEEyMVA3b2FqQzJ3UzloZ1BLaytmdXJweUVTbWtYZzEzbzNKcWFYQVJtck81R1UrQU1rUDVFcmpvMm14cVBXc3ByQTlkNGNZVU1hcU83bHBTaGJsU0lYSHljYUEzXC9NSmlidnQ0WU5oeVE1OFJweWVtMGYyXC9DbW1ERDBMRFFmUWRBS3NUemRXSW10cmdzTkVnWTZDQ0d6YzNHNldVVGpiaXlIUWVqdnlcL2dmRGx6VDZOZ0d2bEtnK0RQTFcxanliWWU0Ym5wT1FrUTBtaEhzZlAxZXArSDRNaVRWcVowR2JMWlFuMGNPS2hseFE2eUg3MGJVa1lBcDljRk1LT2hTZUdKckw4SWxxK01FUnY4dHZaY2JSaHc9PSIsIm1hYyI6ImJjYTRlNzljYjc3NTg0NWNiOWQxN2UxYzJmNmRhNjNlMmE1ZGE4YzRkNTZiNzJjNGZiYjM0M2U4ZmIxZmViOWYifQ=
="
)
requestHeader
.
add
(
name
:
"token"
,
value
:
"eyJpdiI6I
k1yM1RTNkVqUEJBd0J3OVNEb2FNeWc9PSIsInZhbHVlIjoiQzNZMkxmTldHbXdtU0lFdkNYenNxRXIwYTM0ak5Ec0JCTTJlNnhTcGFqMUx6ZWVwb25aS281WFRxMUhvUFFqOEtEV1RZbmFPMHliUlRvQ0dEY3g4Vzg0QklmcGRmeXFYRlwvcSt0SE83SE8za0VSandjdlV2TENFT05GMlUrRXNVM3hSTzFIa29YU3dKRStaUGpsV1h4OXcwUDZpb1czZTk5RUE3ZFlvSTQ4QkhNS2JURExWY1puRjZZYmxqVFB2Ync2XC9RaDRwWHlXWmdTdlZVWTR5bXpYVG4zRFg0dnlCSFZuOURQSjgyaEE2WndERUV2STRqcmM3bkphRFwvWVhQMFwvQ1o2aEI0YmRpV1JmeDZ2bDJBQ0pXWkZ1a3d5Zm04RU0za21USnlGZUdld053enVvZ25CXC9lKzNVSkhFSHg3dGdyQm9HWDJJcXZqZGdoekUrNEZFSzljWDRjQk9WMGdGaGVjdjNRV09ieFJoZ3gzSjN1ckhzdHhpNStyam4xVjB0QjVJZDk2aDJkNnhPODJON3dHY2J6RWpqNDRGNk9uU0pKV05GQ0o5MnBHcVhabVc3VVNTdXRORE5lT1hXVGdGS1d2bEhPNkdCc1hNbk00a0R3UUJjblJoU1ZWb09PMDBaMkhFYU5hTGE5a1I5V1RNRld5UGIyY0owS3BYVlRmUStmMXl0MWhjV2tMZzJjRXlkY1p3OVJ5cFlEdWVsN1M5YUNpRzIxUlIyc3d6VVpQMmswYzBxY2xyS1d1YkZyb2RzY3pXdGdaMU5JenEzMmhBQ1RwcWFoVHpSVnZXemhiZ1B5eEJKd1I2UVh2eHFZZVZka0VwXC9xanFZU0M2U3Q0dlAybmk0NlJhZ05BdlVMVFNZM3FcL1RYS1pUdHRYU3pmR1ZNbUhXWGNENFA3MEpJeDdrbFZUWmdacERhT2ZxOVVFM0drZHZHc1NUemNnOThGUkxxSHJsOFZ2akxqT1VHaDlkdVFXT0hKZ0w2cSthb1plaTl3VHhObElcL1wvR2RIbVdoQndJNEdcLzByRlpzMDlIbjI5R2FqYldzTmNxRHJwZVJsTFpjWmpqNno4S0Q4cHNCcFcyNXY4SmJnUlVpRlwvY0RIVzRBdFpQMEM0Q25sM1NjbUpIZHZPZ1U2dXZvSkx6Y1BaSWFXZnJQakRTNVlVMFNwUDg3NlJnNW5cL0lISWpYTVlKU1htYjVmQWZUXC82UjlmWkREd0RoU3FWYksyUFwvRnpJWjh5VVhnRFp5VGxHOTE2UGUwVTN5RWlUUlwvWEw0eDFrUGtKWkRCdWFXYkM5SFwvaHc5RFdWZDdmSmJyVlN3Q01ZdkJQQ2JScCs1UFA2QjVhNWE5cCtWbVwvYTZ1dmZBVWlweU4wYXJPblVcL0VtdTN6c2JVamRoTmM1WW0yXC95S3N3UTR0Rm12VmNKU3QyN0JsVjUwVUt2a0hhM0I2SUhiRUxzMU9RbkxIQVNkVTVpTmJwYWFyMWpWbnNJaGljZlRyVm5TZ2t0S2k3ckp1VEdGd2hjYSt3azFLN1wvUFA2eGJuOUFRbHByUmE0VjA2dmVidmdTQkY5UWpDQlg0QVVsZ1RvTE5RUEZTbkxFVWRKcEQ5aDI0XC9JdXNjOCtDVjRnWERcL2ZqXC82RGhMdVZBT3dMd3VLTWhIQXZDanlpVW54RUxlUDFxZjZLMjVsckRuRjlZbmxORENoVHU5MXhhRitBYyt5MmV4WFwvWitlUTZ6VG5aYlh5MW42VkRzY0hcL0ZrVUNrNXVxNVVXYjhnZnRFaWhlUWdXc2Z4NmpEaGplYXFjSUlHNFYra3BvUmt3WGxONjF4bCtaQVFnSmxrT2I2TjhkYndoTE13YWFWNEZNRENMMkEwS1habjhSUWRwd3ZkeGNuNUhMOFhzdkpKRzdnUnBzT2orWGh6WWpRPT0iLCJtYWMiOiIwNTIzOTU3MGIxODIzZjA1YTViZDBmM2Y5ZWZhMDAyZWQ4ZWY4MmQzNGJjY2FmNTFmOTNlZGY5ODA3NTBkZDgxIn0
="
)
headers
=
requestHeader
}
...
...
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