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
2df201cf
Commit
2df201cf
authored
Oct 22, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS
into develop
parents
07a4f345
853cfb18
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
19 deletions
+40
-19
YHResignCertificateDetailHkViewController.swift
...续期证件管理)/C/YHResignCertificateDetailHkViewController.swift
+1
-0
YHResignCertificateDetailPassPortViewController.swift
...)/C/YHResignCertificateDetailPassPortViewController.swift
+1
-0
YHResignCertificateHKTableViewCell.swift
...Manage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift
+27
-12
YHResignCertificatePassportTableViewCell.swift
...(续期证件管理)/V/YHResignCertificatePassportTableViewCell.swift
+3
-1
YHResignUploadTravelHKViewController.swift
...Crad(上传旅行证件)/C/YHResignUploadTravelHKViewController.swift
+1
-0
YHResignUploadTravelPassportViewController.swift
...传旅行证件)/C/YHResignUploadTravelPassportViewController.swift
+1
-0
YHResignUploadTravelHKTableViewCell.swift
...lCrad(上传旅行证件)/V/YHResignUploadTravelHKTableViewCell.swift
+6
-6
No files found.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailHkViewController.swift
View file @
2df201cf
...
@@ -350,6 +350,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
...
@@ -350,6 +350,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
}
else
{
}
else
{
self
.
dataModel
.
cert_info
.
img_back
=
""
self
.
dataModel
.
cert_info
.
img_back
=
""
}
}
self
.
updateData
()
}
}
cell
.
block
=
{[
weak
self
]
model
in
cell
.
block
=
{[
weak
self
]
model
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailPassPortViewController.swift
View file @
2df201cf
...
@@ -277,6 +277,7 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
...
@@ -277,6 +277,7 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
if
index
==
0
{
if
index
==
0
{
self
.
dataModel
.
cert_info
.
img_front
=
""
self
.
dataModel
.
cert_info
.
img_front
=
""
}
}
self
.
updateData
()
}
}
cell
.
block
=
{[
weak
self
]
model
in
cell
.
block
=
{[
weak
self
]
model
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift
View file @
2df201cf
...
@@ -70,16 +70,27 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
...
@@ -70,16 +70,27 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
var
urls
:
[
String
]?
{
var
urls
:
[
String
]?
{
didSet
{
didSet
{
guard
let
firstUrl
=
urls
?
.
first
,
firstUrl
.
count
!=
0
else
{
guard
let
firstUrl
=
urls
?
.
first
,
firstUrl
.
count
!=
0
else
{
cerInfoLabel
.
isHidden
=
true
guard
let
lastUrl
=
urls
?
.
last
,
lastUrl
.
count
!=
0
else
{
cerNumberView
.
isHidden
=
true
cerInfoLabel
.
isHidden
=
true
cerSignPlaceView
.
isHidden
=
true
cerNumberView
.
isHidden
=
true
cardLabel
.
isHidden
=
true
cerSignPlaceView
.
isHidden
=
true
signLabel
.
isHidden
=
true
cardLabel
.
isHidden
=
true
cardBeginView
.
isHidden
=
true
signLabel
.
isHidden
=
true
cardEndView
.
isHidden
=
true
cardBeginView
.
isHidden
=
true
signBeginView
.
isHidden
=
true
cardEndView
.
isHidden
=
true
signEndView
.
isHidden
=
true
signBeginView
.
isHidden
=
true
guard
let
lastUrl
=
urls
?
.
last
,
lastUrl
.
count
!=
0
else
{
return
}
signEndView
.
isHidden
=
true
return
}
cerInfoLabel
.
isHidden
=
false
cerNumberView
.
isHidden
=
false
cerSignPlaceView
.
isHidden
=
false
cardLabel
.
isHidden
=
false
signLabel
.
isHidden
=
false
cardBeginView
.
isHidden
=
false
cardEndView
.
isHidden
=
false
signBeginView
.
isHidden
=
false
signEndView
.
isHidden
=
false
self
.
lastUrl
=
lastUrl
self
.
lastUrl
=
lastUrl
self
.
viewModel
.
getPublicImageUrl
(
lastUrl
)
{[
weak
self
]
success
,
error
in
self
.
viewModel
.
getPublicImageUrl
(
lastUrl
)
{[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
...
@@ -155,7 +166,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
...
@@ -155,7 +166,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
if
self
.
compareDates
(
dateString1
:
item
.
message
??
""
,
dateString2
:
self
.
dataModel
.
valid_date
)
{
if
self
.
compareDates
(
dateString1
:
item
.
message
??
""
,
dateString2
:
self
.
dataModel
.
valid_date
)
{
failString
=
""
failString
=
""
}
else
{
}
else
{
failString
=
"卡片有效期不足,需要为
\(
self
.
dataModel
.
valid_date
)
或以后"
if
item
.
message
!=
""
{
failString
=
"卡片有效期不足,需要为
\(
self
.
dataModel
.
valid_date
)
或以后"
}
}
}
}
}
if
item
.
id
==
.
id3
{
// 签注有效期开始时间
if
item
.
id
==
.
id3
{
// 签注有效期开始时间
...
@@ -189,7 +202,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
...
@@ -189,7 +202,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
if
failString
==
"卡片有效期不足,需要为
\(
self
.
dataModel
.
valid_date
)
或以后"
{
if
failString
==
"卡片有效期不足,需要为
\(
self
.
dataModel
.
valid_date
)
或以后"
{
}
else
{
}
else
{
failString
=
"签注有效期不足,需要为
\(
self
.
dataModel
.
sign_valid_date
)
或以后"
if
item
.
message
!=
""
{
failString
=
"签注有效期不足,需要为
\(
self
.
dataModel
.
sign_valid_date
)
或以后"
}
}
}
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificatePassportTableViewCell.swift
View file @
2df201cf
...
@@ -112,7 +112,9 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
...
@@ -112,7 +112,9 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
if
self
.
compareDates
(
dateString1
:
item
.
message
??
""
,
dateString2
:
self
.
dataModel
.
valid_date
)
{
if
self
.
compareDates
(
dateString1
:
item
.
message
??
""
,
dateString2
:
self
.
dataModel
.
valid_date
)
{
failString
=
""
failString
=
""
}
else
{
}
else
{
failString
=
"有效期不足,需要为
\(
self
.
dataModel
.
valid_date
)
或以后"
if
item
.
message
!=
""
{
failString
=
"有效期不足,需要为
\(
self
.
dataModel
.
valid_date
)
或以后"
}
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelHKViewController.swift
View file @
2df201cf
...
@@ -308,6 +308,7 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
...
@@ -308,6 +308,7 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
}
else
{
}
else
{
self
.
dataModel
.
img_back
=
""
self
.
dataModel
.
img_back
=
""
}
}
self
.
updateAllViews
()
}
}
cell
.
block
=
{[
weak
self
]
model
in
cell
.
block
=
{[
weak
self
]
model
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelPassportViewController.swift
View file @
2df201cf
...
@@ -247,6 +247,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
...
@@ -247,6 +247,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
if
index
==
0
{
if
index
==
0
{
self
.
dataModel
.
img_front
=
""
self
.
dataModel
.
img_front
=
""
}
}
self
.
updateAllViews
()
}
}
cell
.
block
=
{[
weak
self
]
model
in
cell
.
block
=
{[
weak
self
]
model
in
guard
let
self
=
self
else
{
return
}
guard
let
self
=
self
else
{
return
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelHKTableViewCell.swift
View file @
2df201cf
...
@@ -83,12 +83,12 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
...
@@ -83,12 +83,12 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
})
})
self
.
backSurfaceImageButton
.
setContent
(
""
,
""
)
self
.
backSurfaceImageButton
.
setContent
(
""
,
""
)
}
}
cardLabel
.
isHidden
=
tru
e
cardLabel
.
isHidden
=
fals
e
signLabel
.
isHidden
=
tru
e
signLabel
.
isHidden
=
fals
e
cardBeginView
.
isHidden
=
tru
e
cardBeginView
.
isHidden
=
fals
e
cardEndView
.
isHidden
=
tru
e
cardEndView
.
isHidden
=
fals
e
signBeginView
.
isHidden
=
tru
e
signBeginView
.
isHidden
=
fals
e
signEndView
.
isHidden
=
tru
e
signEndView
.
isHidden
=
fals
e
return
return
}
}
cardLabel
.
isHidden
=
false
cardLabel
.
isHidden
=
false
...
...
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