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
aa85a7b0
Commit
aa85a7b0
authored
Jun 11, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、文件 清单 优化
2、使用同一变量
parent
175f3733
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
133 additions
and
20 deletions
+133
-20
YHHomeBannerView.swift
.../galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
+0
-4
YHFileListItemView.swift
...ntService(服务中心)/FileList(文件清单)/V/YHFileListItemView.swift
+51
-5
YHFileListItemsView.swift
...tService(服务中心)/FileList(文件清单)/V/YHFileListItemsView.swift
+33
-5
YHCertificateUploadContentListVC.swift
...rtificates(我的证书)/C/YHCertificateUploadContentListVC.swift
+1
-1
YHFormItemDegreeInfoCell.swift
...程)/FamilyMember(家庭成员信息表)/V/YHFormItemDegreeInfoCell.swift
+1
-1
YHDetailMessageCell.swift
...y/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift
+1
-1
YHMessageSessionCell.swift
.../Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift
+1
-1
YHPersonalCenterCell.swift
...axy/Classes/Modules/Mine(我的)/V/YHPersonalCenterCell.swift
+1
-1
UIColor+Extension.swift
...xy/galaxy/Classes/Tools/Extention/UIColor+Extension.swift
+0
-1
Contents.json
...er/清单列表/file_list_right_arrow_blue.imageset/Contents.json
+22
-0
Group 2033194932@2x.png
...le_list_right_arrow_blue.imageset/Group 2033194932@2x.png
+0
-0
Group 2033194932@3x.png
...le_list_right_arrow_blue.imageset/Group 2033194932@3x.png
+0
-0
Contents.json
...ter/清单列表/file_list_right_arrow_red.imageset/Contents.json
+22
-0
Group 2033194932@2x.png
...ile_list_right_arrow_red.imageset/Group 2033194932@2x.png
+0
-0
Group 2033194932@3x.png
...ile_list_right_arrow_red.imageset/Group 2033194932@3x.png
+0
-0
No files found.
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
View file @
aa85a7b0
...
@@ -26,12 +26,8 @@ class YHHomeBannerView: UIView {
...
@@ -26,12 +26,8 @@ class YHHomeBannerView: UIView {
bannerView
.
selectItem
(
at
:
0
,
animated
:
false
)
bannerView
.
selectItem
(
at
:
0
,
animated
:
false
)
// 开启定时器开始滚动
// 开启定时器开始滚动
bannerView
.
automaticSlidingInterval
=
bannerSildingInterval
bannerView
.
automaticSlidingInterval
=
bannerSildingInterval
bannerView
.
removesInfiniteLoopForSingleItem
=
true
bannerView
.
removesInfiniteLoopForSingleItem
=
true
bannerView
.
alwaysBounceHorizontal
=
true
bannerView
.
alwaysBounceHorizontal
=
true
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemView.swift
View file @
aa85a7b0
...
@@ -53,15 +53,28 @@ class YHFileListItemView: UIView {
...
@@ -53,15 +53,28 @@ class YHFileListItemView: UIView {
//status
//status
private
lazy
var
statusLable
:
UILabel
=
{
private
lazy
var
statusLable
:
UILabel
=
{
let
lable0
=
UILabel
(
text
:
"
状态
"
)
let
lable0
=
UILabel
(
text
:
"
待提交
"
)
lable0
.
textColor
=
UIColor
.
brandMainColor
lable0
.
textColor
=
UIColor
.
brandMainColor
lable0
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
12
)
lable0
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
12
)
lable0
.
numberOfLines
=
0
lable0
.
lineBreakMode
=
.
byWordWrapping
lable0
.
lineBreakMode
=
.
byWordWrapping
lable0
.
textAlignment
=
.
right
lable0
.
textAlignment
=
.
right
return
lable0
return
lable0
}()
}()
private
lazy
var
nextImageView
:
UIImageView
=
{
let
view
=
UIImageView
()
view
.
contentMode
=
.
scaleAspectFill
view
.
image
=
UIImage
(
named
:
"file_list_right_arrow_blue"
)
return
view
}()
private
lazy
var
statusHoldView
:
UIView
=
{
let
view
=
UIView
()
view
.
backgroundColor
=
.
clear
return
view
}()
//line
//line
private
lazy
var
line
:
UIView
=
{
private
lazy
var
line
:
UIView
=
{
let
view
=
UIView
()
let
view
=
UIView
()
...
@@ -70,6 +83,12 @@ class YHFileListItemView: UIView {
...
@@ -70,6 +83,12 @@ class YHFileListItemView: UIView {
}()
}()
var
dataModel
:
YHSupplementInfo
?
{
var
dataModel
:
YHSupplementInfo
?
{
didSet
{
didSet
{
...
@@ -98,15 +117,40 @@ private extension YHFileListItemView {
...
@@ -98,15 +117,40 @@ private extension YHFileListItemView {
make
.
centerY
.
equalToSuperview
()
make
.
centerY
.
equalToSuperview
()
}
}
addSubview
(
statusLable
)
// addSubview(statusLable)
statusLable
.
snp
.
makeConstraints
{
make
in
// statusLable.snp.makeConstraints { make in
// make.right.equalTo(-26)
// make.centerY.equalToSuperview()
// make.height.equalTo(20)
// make.width.equalTo(60)
// }
addSubview
(
statusHoldView
)
statusHoldView
.
snp
.
makeConstraints
{
make
in
make
.
right
.
equalTo
(
-
26
)
make
.
right
.
equalTo
(
-
26
)
make
.
centerY
.
equalToSuperview
()
make
.
centerY
.
equalToSuperview
()
make
.
height
.
equalTo
(
20
)
make
.
height
.
equalTo
(
20
)
make
.
width
.
equalTo
(
60
+
16
)
}
statusHoldView
.
addSubview
(
nextImageView
)
nextImageView
.
snp
.
makeConstraints
{
make
in
make
.
right
.
equalToSuperview
()
make
.
centerY
.
equalToSuperview
()
make
.
height
.
width
.
equalTo
(
16
)
}
statusHoldView
.
addSubview
(
statusLable
)
statusLable
.
snp
.
makeConstraints
{
make
in
make
.
right
.
equalTo
(
nextImageView
.
snp
.
left
)
.
offset
(
0
)
make
.
centerY
.
equalToSuperview
()
make
.
height
.
equalTo
(
20
)
make
.
width
.
equalTo
(
60
)
make
.
width
.
equalTo
(
60
)
}
}
addSubview
(
titleLable
)
addSubview
(
titleLable
)
titleLable
.
snp
.
makeConstraints
{
make
in
titleLable
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
kMargin
)
make
.
top
.
equalTo
(
kMargin
)
...
@@ -145,9 +189,11 @@ extension YHFileListItemView {
...
@@ -145,9 +189,11 @@ extension YHFileListItemView {
if
dataModel
.
checkStatus
==
2
{
if
dataModel
.
checkStatus
==
2
{
text
=
"需重传"
text
=
"需重传"
color
=
.
failColor
color
=
.
failColor
nextImageView
.
image
=
UIImage
(
named
:
"file_list_right_arrow_red"
)
}
else
if
dataModel
.
checkStatus
==
3
{
}
else
if
dataModel
.
checkStatus
==
3
{
text
=
"待提交"
text
=
"待提交"
color
=
.
brandMainColor
color
=
.
brandMainColor
nextImageView
.
image
=
UIImage
(
named
:
"file_list_right_arrow_blue"
)
}
else
{
}
else
{
text
=
"需过滤"
+
String
(
dataModel
.
checkStatus
)
text
=
"需过滤"
+
String
(
dataModel
.
checkStatus
)
color
=
UIColor
.
purple
color
=
UIColor
.
purple
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemsView.swift
View file @
aa85a7b0
...
@@ -68,11 +68,42 @@ private extension YHFileListItemsView {
...
@@ -68,11 +68,42 @@ private extension YHFileListItemsView {
}
}
if
dataModel
.
supplement_list
.
isEmpty
{
let
holdView
:
UIView
=
UIView
()
holdView
.
backgroundColor
=
UIColor
(
hex
:
0xE5E9F2
,
alpha
:
0.3
)
addSubview
(
holdView
)
holdView
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
titleLable
.
snp
.
bottom
)
.
offset
(
14
)
make
.
left
.
equalToSuperview
()
.
offset
(
kMargin
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
kMargin
)
make
.
bottom
.
equalToSuperview
()
make
.
height
.
equalTo
(
72
)
}
let
lable
=
UILabel
()
lable
.
text
=
"暂无待完善清单"
lable
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
12
)
lable
.
textColor
=
UIColor
(
hex
:
0x94A3B8
,
alpha
:
1.0
)
holdView
.
addSubview
(
lable
)
lable
.
snp
.
makeConstraints
{
make
in
make
.
centerX
.
equalToSuperview
()
make
.
centerY
.
equalToSuperview
()
}
return
}
let
holdView
:
UIView
=
UIView
()
let
holdView
:
UIView
=
UIView
()
holdView
.
layer
.
cornerRadius
=
kCornerRadius6
holdView
.
layer
.
cornerRadius
=
kCornerRadius6
holdView
.
clipsToBounds
=
true
holdView
.
clipsToBounds
=
true
holdView
.
layer
.
borderWidth
=
0.5
holdView
.
layer
.
borderWidth
=
0.5
holdView
.
layer
.
borderColor
=
UIColor
.
separatorColor
.
cgColor
holdView
.
layer
.
borderColor
=
UIColor
(
hex
:
0xDEE5F1
,
alpha
:
1.0
)
.
cgColor
addSubview
(
holdView
)
addSubview
(
holdView
)
holdView
.
snp
.
makeConstraints
{
make
in
holdView
.
snp
.
makeConstraints
{
make
in
...
@@ -83,7 +114,7 @@ private extension YHFileListItemsView {
...
@@ -83,7 +114,7 @@ private extension YHFileListItemsView {
}
}
let
sessionView
:
UIView
=
UIView
()
let
sessionView
:
UIView
=
UIView
()
sessionView
.
backgroundColor
=
UIColor
(
hex
:
0x
D9E4FD
,
alpha
:
1.0
)
sessionView
.
backgroundColor
=
UIColor
(
hex
:
0x
E5E9F2
,
alpha
:
0.3
)
holdView
.
addSubview
(
sessionView
)
holdView
.
addSubview
(
sessionView
)
if
dataModel
.
supplement_list
.
isEmpty
{
if
dataModel
.
supplement_list
.
isEmpty
{
...
@@ -167,6 +198,3 @@ private extension YHFileListItemsView {
...
@@ -167,6 +198,3 @@ private extension YHFileListItemsView {
holdView
.
layer
.
borderColor
=
UIColor
(
hex
:
0xDEE5F1
,
alpha
:
1.0
)
.
cgColor
holdView
.
layer
.
borderColor
=
UIColor
(
hex
:
0xDEE5F1
,
alpha
:
1.0
)
.
cgColor
}
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift
View file @
aa85a7b0
...
@@ -390,7 +390,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
...
@@ -390,7 +390,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
}
else
if
supplementInfo
.
checkStatus
==
YHCertificateUploadStatus
.
rejected
.
rawValue
{
}
else
if
supplementInfo
.
checkStatus
==
YHCertificateUploadStatus
.
rejected
.
rawValue
{
text
=
"已驳回"
.
local
text
=
"已驳回"
.
local
textColor
=
UIColor
(
hexString
:
"#F81D22"
)
!
textColor
=
UIColor
.
failColor
bgColor
=
UIColor
(
hexString
:
"#F81D22"
,
transparency
:
0.08
)
!
bgColor
=
UIColor
(
hexString
:
"#F81D22"
,
transparency
:
0.08
)
!
}
}
statusLabel
.
text
=
text
statusLabel
.
text
=
text
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemDegreeInfoCell.swift
View file @
aa85a7b0
...
@@ -76,7 +76,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
...
@@ -76,7 +76,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
let
btn
=
UIButton
()
let
btn
=
UIButton
()
btn
.
setTitle
(
"删除"
,
for
:
.
normal
)
btn
.
setTitle
(
"删除"
,
for
:
.
normal
)
btn
.
titleLabel
?
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
14
)
btn
.
titleLabel
?
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
14
)
btn
.
setTitleColor
(
UIColor
(
hex
:
0xF81D22
)
,
for
:
.
normal
)
btn
.
setTitleColor
(
UIColor
.
failColor
,
for
:
.
normal
)
btn
.
addTarget
(
self
,
action
:
#selector(
didClickDeleteBtn(btn:)
)
,
for
:
.
touchUpInside
)
btn
.
addTarget
(
self
,
action
:
#selector(
didClickDeleteBtn(btn:)
)
,
for
:
.
touchUpInside
)
btn
.
isHidden
=
true
btn
.
isHidden
=
true
return
btn
return
btn
...
...
galaxy/galaxy/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift
View file @
aa85a7b0
...
@@ -109,7 +109,7 @@ class YHDetailMessageCell: UITableViewCell {
...
@@ -109,7 +109,7 @@ class YHDetailMessageCell: UITableViewCell {
whiteView
.
addSubview
(
titleLabel
)
whiteView
.
addSubview
(
titleLabel
)
unreadPointView
=
UIView
()
unreadPointView
=
UIView
()
unreadPointView
.
backgroundColor
=
UIColor
(
hex
:
0xF81D22
)
unreadPointView
.
backgroundColor
=
UIColor
.
failColor
unreadPointView
.
layer
.
cornerRadius
=
Self
.
unreadPointWidth
/
2.0
unreadPointView
.
layer
.
cornerRadius
=
Self
.
unreadPointWidth
/
2.0
unreadPointView
.
clipsToBounds
=
true
unreadPointView
.
clipsToBounds
=
true
whiteView
.
addSubview
(
unreadPointView
)
whiteView
.
addSubview
(
unreadPointView
)
...
...
galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift
View file @
aa85a7b0
...
@@ -110,7 +110,7 @@ class YHMessageSessionCell: UITableViewCell {
...
@@ -110,7 +110,7 @@ class YHMessageSessionCell: UITableViewCell {
iconContentView
.
addSubview
(
iconImgView
)
iconContentView
.
addSubview
(
iconImgView
)
badgeLabel
=
UILabel
()
badgeLabel
=
UILabel
()
badgeLabel
.
backgroundColor
=
UIColor
(
hex
:
0xF81D22
)
badgeLabel
.
backgroundColor
=
UIColor
.
failColor
badgeLabel
.
textColor
=
.
white
badgeLabel
.
textColor
=
.
white
badgeLabel
.
textAlignment
=
.
center
badgeLabel
.
textAlignment
=
.
center
badgeLabel
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
10
)
badgeLabel
.
font
=
UIFont
.
PFSC_M
(
ofSize
:
10
)
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/V/YHPersonalCenterCell.swift
View file @
aa85a7b0
...
@@ -28,7 +28,7 @@ class YHPersonalCenterCell: UITableViewCell {
...
@@ -28,7 +28,7 @@ class YHPersonalCenterCell: UITableViewCell {
lazy
var
redPointView
:
UIView
=
{
lazy
var
redPointView
:
UIView
=
{
let
view
=
UIView
()
let
view
=
UIView
()
view
.
backgroundColor
=
UIColor
(
hex
:
0xF81D22
)
view
.
backgroundColor
=
UIColor
.
failColor
view
.
layer
.
cornerRadius
=
Self
.
redPointWidth
/
2.0
view
.
layer
.
cornerRadius
=
Self
.
redPointWidth
/
2.0
view
.
clipsToBounds
=
true
view
.
clipsToBounds
=
true
return
view
return
view
...
...
galaxy/galaxy/Classes/Tools/Extention/UIColor+Extension.swift
View file @
aa85a7b0
...
@@ -62,7 +62,6 @@ extension UIColor {
...
@@ -62,7 +62,6 @@ extension UIColor {
//提示 color
//提示 color
static
let
tipsColor
:
UIColor
=
UIColor
(
hexString
:
"#2F7EF6"
)
!
static
let
tipsColor
:
UIColor
=
UIColor
(
hexString
:
"#2F7EF6"
)
!
//页面背景
//页面背景
static
let
pageBkgColor
:
UIColor
=
UIColor
(
hexString
:
"#F8F8F8"
)
!
static
let
pageBkgColor
:
UIColor
=
UIColor
(
hexString
:
"#F8F8F8"
)
!
...
...
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_right_arrow_blue.imageset/Contents.json
0 → 100644
View file @
aa85a7b0
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"Group 2033194932@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"Group 2033194932@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_right_arrow_blue.imageset/Group 2033194932@2x.png
0 → 100644
View file @
aa85a7b0
291 Bytes
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_right_arrow_blue.imageset/Group 2033194932@3x.png
0 → 100644
View file @
aa85a7b0
372 Bytes
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_right_arrow_red.imageset/Contents.json
0 → 100644
View file @
aa85a7b0
{
"images"
:
[
{
"idiom"
:
"universal"
,
"scale"
:
"1x"
},
{
"filename"
:
"Group 2033194932@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"Group 2033194932@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"author"
:
"xcode"
,
"version"
:
1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_right_arrow_red.imageset/Group 2033194932@2x.png
0 → 100644
View file @
aa85a7b0
210 Bytes
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_right_arrow_red.imageset/Group 2033194932@3x.png
0 → 100644
View file @
aa85a7b0
383 Bytes
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