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
d931f896
Commit
d931f896
authored
Mar 14, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 我的tab UI走查
parent
b7b15cec
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
37 deletions
+27
-37
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+3
-12
YHUserInfoHeaderView.swift
...axy/Classes/Modules/Mine(我的)/V/YHUserInfoHeaderView.swift
+22
-23
Contents.json
...ets.xcassets/Mine/mine_evaluate_bg.imageset/Contents.json
+2
-2
Group 2033194041 1@2x.png
.../Mine/mine_evaluate_bg.imageset/Group 2033194041 1@2x.png
+0
-0
Group 2033194041 1@3x.png
.../Mine/mine_evaluate_bg.imageset/Group 2033194041 1@3x.png
+0
-0
测评测评@2x.png
...ssets.xcassets/Mine/mine_evaluate_bg.imageset/测评测评@2x.png
+0
-0
测评测评@3x.png
...ssets.xcassets/Mine/mine_evaluate_bg.imageset/测评测评@3x.png
+0
-0
No files found.
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
d931f896
...
...
@@ -42,14 +42,16 @@ struct PersonalModuleItem {
class
YHMyViewController
:
YHBaseViewController
,
ConstraintRelatableTarget
{
lazy
var
tableView
:
UITableView
=
{
let
tableView
=
UITableView
(
frame
:
CGRect
.
zero
,
style
:
.
plain
)
let
tableView
=
UITableView
(
frame
:
CGRect
.
zero
,
style
:
.
grouped
)
if
#available(iOS 11.0, *)
{
tableView
.
contentInsetAdjustmentBehavior
=
.
never
}
tableView
.
estimatedSectionHeaderHeight
=
1.0
tableView
.
showsVerticalScrollIndicator
=
false
tableView
.
tableHeaderView
=
headerView
tableView
.
backgroundColor
=
.
clear
tableView
.
separatorStyle
=
.
none
tableView
.
bounces
=
false
tableView
.
register
(
YHPersonalCenterCell
.
self
,
forCellReuseIdentifier
:
YHPersonalCenterCell
.
cellReuseIdentifier
)
tableView
.
delegate
=
self
tableView
.
dataSource
=
self
...
...
@@ -67,7 +69,6 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
PersonalModuleItem
(
icon
:
"mine_item_poster"
,
title
:
"我的海报"
.
local
,
type
:
.
myPoster
),
PersonalModuleItem
(
icon
:
"mine_item_code"
,
title
:
"我的测评码"
.
local
,
type
:
.
myTestCode
),
PersonalModuleItem
(
icon
:
"mine_item_appoint"
,
title
:
"预约银河湾"
.
local
,
type
:
.
appointGalaxyBay
),
PersonalModuleItem
(
icon
:
"mine_item_appoint"
,
title
:
version
,
type
:
.
appointGalaxyBay
),
]
}()
...
...
@@ -98,11 +99,6 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
}
return
view
}()
private
lazy
var
bgImgView
:
UIImageView
=
{
let
img
=
UIImageView
(
image
:
UIImage
(
named
:
"mine_header_bg"
))
return
img
}()
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
...
...
@@ -127,15 +123,10 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
func
initView
()
{
gk_navigationBar
.
isHidden
=
true
view
.
addSubview
(
bgImgView
)
view
.
addSubview
(
tableView
)
updateUserUI
()
bgImgView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
top
.
equalTo
(
view
)
make
.
height
.
equalTo
(
bgImgView
.
snp
.
width
)
.
multipliedBy
(
YHUserInfoHeaderView
.
bgRatio
)
}
tableView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
top
.
equalToSuperview
()
make
.
bottom
.
equalToSuperview
()
.
offset
(
-
k_Height_TabBar
)
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/V/YHUserInfoHeaderView.swift
View file @
d931f896
...
...
@@ -9,9 +9,6 @@
import
UIKit
class
YHUserInfoHeaderView
:
UIView
{
static
let
bgRatio
=
312.0
/
375.0
// 背景图高宽比
static
let
height
=
(
KScreenWidth
*
bgRatio
+
24
)
var
settingBlock
:(()
->
Void
)?
var
evaluateBlock
:(()
->
Void
)?
...
...
@@ -34,7 +31,6 @@ class YHUserInfoHeaderView: UIView {
private
lazy
var
bgImgView
:
UIImageView
=
{
let
imgView
=
UIImageView
(
image
:
UIImage
(
named
:
"mine_header_bg"
))
imgView
.
isHidden
=
true
return
imgView
}()
...
...
@@ -66,14 +62,14 @@ class YHUserInfoHeaderView: UIView {
let
label
=
UILabel
()
label
.
textColor
=
UIColor
(
hexString
:
"#242424"
)
label
.
textAlignment
=
NSTextAlignment
.
left
label
.
font
=
UIFont
.
PFSC_
M
(
ofSize
:
17
)
label
.
font
=
UIFont
.
PFSC_
R
(
ofSize
:
17
)
return
label
}()
private
lazy
var
evaluateBtn
:
UIButton
=
{
let
btn
=
UIButton
()
btn
.
setTitle
(
"免费测评"
,
for
:
.
normal
)
btn
.
titleLabel
?
.
font
=
UIFont
.
PFSC_
M
(
ofSize
:
12
)
btn
.
titleLabel
?
.
font
=
UIFont
.
PFSC_
R
(
ofSize
:
12
)
btn
.
setTitleColor
(
.
white
,
for
:
.
normal
)
btn
.
backgroundColor
=
UIColor
(
hexString
:
"#242424"
)
btn
.
layer
.
cornerRadius
=
6.0
...
...
@@ -110,12 +106,13 @@ class YHUserInfoHeaderView: UIView {
}
static
func
createView
()
->
YHUserInfoHeaderView
{
let
view
=
YHUserInfoHeaderView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
KScreenWidth
,
height
:
Self
.
height
))
let
view
=
YHUserInfoHeaderView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
KScreenWidth
,
height
:
310
+
k_Height_StatusBar
))
return
view
}
private
func
createUI
()
{
self
.
addSubview
(
bgImgView
)
self
.
addSubview
(
settingView
)
settingView
.
addSubview
(
settingBtn
)
...
...
@@ -134,8 +131,10 @@ class YHUserInfoHeaderView: UIView {
evaluateLabel
.
text
=
"香港身份20秒极速测评"
.
local
bgImgView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
top
.
equalToSuperview
()
make
.
height
.
equalTo
(
bgImgView
.
snp
.
width
)
.
multipliedBy
(
Self
.
bgRatio
)
make
.
left
.
right
.
equalTo
(
self
)
let
topMargin
=
(
k_Height_StatusBar
>
20.0
?
0
:
-
24
)
make
.
top
.
equalToSuperview
()
.
offset
(
topMargin
)
make
.
height
.
equalTo
(
312.0
)
}
settingView
.
snp
.
makeConstraints
{
make
in
...
...
@@ -145,7 +144,7 @@ class YHUserInfoHeaderView: UIView {
}
settingBtn
.
snp
.
makeConstraints
{
make
in
make
.
size
.
equalTo
(
CGSize
(
width
:
21
,
height
:
21
)
)
make
.
width
.
height
.
equalTo
(
21.0
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
21
)
make
.
centerY
.
equalToSuperview
()
}
...
...
@@ -160,21 +159,21 @@ class YHUserInfoHeaderView: UIView {
make
.
left
.
equalTo
(
avarImgView
)
make
.
top
.
equalTo
(
avarImgView
.
snp
.
bottom
)
.
offset
(
16
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
30
)
make
.
height
.
equalTo
(
30
.0
)
make
.
height
.
equalTo
(
25
.0
)
}
infoLabel
.
snp
.
makeConstraints
{
make
in
make
.
left
.
equalTo
(
avarImgView
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
30
)
make
.
height
.
equalTo
(
1
8
.0
)
make
.
top
.
equalTo
(
userNameLabel
.
snp
.
bottom
)
.
offset
(
6
)
make
.
height
.
equalTo
(
1
5
.0
)
make
.
top
.
equalTo
(
userNameLabel
.
snp
.
bottom
)
.
offset
(
10
)
}
evaluateView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
equalToSuperview
()
.
offset
(
1
8
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
height
.
equalTo
(
evaluateView
.
snp
.
width
)
.
multipliedBy
(
98.0
/
357.0
)
make
.
top
.
equalTo
(
infoLabel
.
snp
.
bottom
)
.
offset
(
9
.0
)
make
.
left
.
equalToSuperview
()
.
offset
(
1
0
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
7
)
make
.
height
.
equalTo
(
98
)
make
.
top
.
equalTo
(
infoLabel
.
snp
.
bottom
)
.
offset
(
17
.0
)
}
evaluateBgImgView
.
snp
.
makeConstraints
{
make
in
...
...
@@ -182,15 +181,15 @@ class YHUserInfoHeaderView: UIView {
}
evaluateLabel
.
snp
.
makeConstraints
{
make
in
make
.
left
.
equalToSuperview
()
.
offset
(
20
+
13
)
make
.
centerY
.
equalToSuperview
(
)
make
.
height
.
equalTo
(
2
4
.0
)
make
.
left
.
equalToSuperview
()
.
offset
(
32
)
make
.
top
.
equalToSuperview
()
.
offset
(
33
)
make
.
height
.
equalTo
(
2
0
.0
)
}
evaluateBtn
.
snp
.
makeConstraints
{
make
in
make
.
right
.
equalToSuperview
()
.
offset
(
-
20
)
make
.
centerY
.
equalTo
Superview
(
)
make
.
size
.
equalTo
(
CGSize
(
width
:
72
,
height
:
3
0
))
make
.
right
.
equalToSuperview
()
.
offset
(
-
35
)
make
.
centerY
.
equalTo
(
evaluateLabel
)
make
.
size
.
equalTo
(
CGSize
(
width
:
72
,
height
:
3
2
))
}
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_evaluate_bg.imageset/Contents.json
View file @
d931f896
...
...
@@ -5,12 +5,12 @@
"scale"
:
"1x"
},
{
"filename"
:
"
测评测评
@2x.png"
,
"filename"
:
"
Group 2033194041 1
@2x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"filename"
:
"
测评测评
@3x.png"
,
"filename"
:
"
Group 2033194041 1
@3x.png"
,
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
...
...
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_evaluate_bg.imageset/Group 2033194041 1@2x.png
0 → 100644
View file @
d931f896
48.3 KB
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_evaluate_bg.imageset/Group 2033194041 1@3x.png
0 → 100644
View file @
d931f896
52.5 KB
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_evaluate_bg.imageset/测评测评@2x.png
deleted
100644 → 0
View file @
b7b15cec
103 KB
galaxy/galaxy/Res/Assets.xcassets/Mine/mine_evaluate_bg.imageset/测评测评@3x.png
deleted
100644 → 0
View file @
b7b15cec
185 KB
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