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
8f074b7c
Commit
8f074b7c
authored
May 07, 2024
by
Steven杜宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
// 版本update
parent
f242d2aa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
68 additions
and
18 deletions
+68
-18
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+3
-3
YHMySettingViewController.swift
...lasses/Modules/Mine(我的)/C/YHMySettingViewController.swift
+8
-3
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+8
-7
YHMySettingCell.swift
...y/galaxy/Classes/Modules/Mine(我的)/V/YHMySettingCell.swift
+33
-4
YHUserInfoHeaderView.swift
...axy/Classes/Modules/Mine(我的)/V/YHUserInfoHeaderView.swift
+15
-0
YHAppVersionForceUpdateView.swift
...s/VersionUpload(版本更新)/V/YHAppVersionForceUpdateView.swift
+1
-1
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
8f074b7c
...
...
@@ -3074,7 +3074,7 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
dev.intelligenceGalaxy
.profile
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
com.dev
.profile
;
SWIFT_ACTIVE_COMPILATION_CONDITIONS
=
TESTENV
;
SWIFT_EMIT_LOC_STRINGS
=
YES
;
SWIFT_OBJC_BRIDGING_HEADER
=
"$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"
;
...
...
@@ -3280,7 +3280,7 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
dev.intelligenceGalaxy
.profile
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
com.dev
.profile
;
SWIFT_EMIT_LOC_STRINGS
=
YES
;
SWIFT_OBJC_BRIDGING_HEADER
=
"$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"
;
SWIFT_VERSION
=
5.0
;
...
...
@@ -3328,7 +3328,7 @@
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
dev.intelligenceGalaxy
.profile
;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]"
=
com.dev
.profile
;
SWIFT_EMIT_LOC_STRINGS
=
YES
;
SWIFT_OBJC_BRIDGING_HEADER
=
"$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"
;
SWIFT_VERSION
=
5.0
;
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMySettingViewController.swift
View file @
8f074b7c
...
...
@@ -49,18 +49,22 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
return
[
PersonalModuleItem
(
title
:
"通知设置"
.
local
,
type
:
.
notifySettings
),
PersonalModuleItem
(
title
:
"权限配置"
.
local
,
type
:
.
permissionSettings
),
PersonalModuleItem
(
title
:
"关于我们"
.
local
,
type
:
.
aboutUs
),
PersonalModuleItem
(
title
:
"设备相关"
.
local
,
type
:
.
deviceInfo
)]
PersonalModuleItem
(
title
:
"设备相关"
.
local
,
type
:
.
deviceInfo
),
PersonalModuleItem
(
title
:
"版本
\(
UIDevice
.
appVersion
()
)
"
,
type
:
.
version
)]
#elseif TESTENV
return
[
PersonalModuleItem
(
title
:
"通知设置"
.
local
,
type
:
.
notifySettings
),
PersonalModuleItem
(
title
:
"权限配置"
.
local
,
type
:
.
permissionSettings
),
PersonalModuleItem
(
title
:
"关于我们"
.
local
,
type
:
.
aboutUs
),
PersonalModuleItem
(
title
:
"设备相关"
.
local
,
type
:
.
deviceInfo
)]
PersonalModuleItem
(
title
:
"设备相关"
.
local
,
type
:
.
deviceInfo
),
PersonalModuleItem
(
title
:
"版本
\(
UIDevice
.
appVersion
()
)
"
,
type
:
.
version
)]
#else
return
[
PersonalModuleItem
(
title
:
"通知设置"
.
local
,
type
:
.
notifySettings
),
PersonalModuleItem
(
title
:
"权限配置"
.
local
,
type
:
.
permissionSettings
),
// PersonalModuleItem(title: "个人信息收集清单".local, type:.infoCollectList),
// PersonalModuleItem(title: "第三方信息共享清单".local, type:.infoShareList),
PersonalModuleItem
(
title
:
"关于我们"
.
local
,
type
:
.
aboutUs
)]
PersonalModuleItem
(
title
:
"关于我们"
.
local
,
type
:
.
aboutUs
),
PersonalModuleItem
(
title
:
"版本
\(
UIDevice
.
appVersion
()
)
"
,
type
:
.
version
)]
#endif
}()
...
...
@@ -111,6 +115,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
versionLabel
.
text
=
version
#endif
}
@objc
func
logout
()
{
YHHUD
.
show
(
.
progress
(
message
:
"退出登录中..."
))
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
8f074b7c
...
...
@@ -26,6 +26,7 @@ enum YHPersonalModuleItemType: Int {
case
infoShareList
case
aboutUs
case
deviceInfo
case
version
}
class
PersonalModuleItem
{
...
...
@@ -237,14 +238,14 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
#if DEBUG
if
true
{
let
view
=
YHFindAppNewVersionView
.
alertView
()
view
.
updateContentArray
([
"阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发。 "
,
"阿打发打发是的发生富士达"
,
"阿打发打发山东发斯蒂芬撒打发撒打发手打"
,
"阿斯顿发发是的发生"
])
view
.
show
()
//
let view = YHFindAppNewVersionView.alertView()
//
view.updateContentArray(["阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发。 ",
//
"阿打发打发是的发生富士达",
//
"阿打发打发山东发斯蒂芬撒打发撒打发手打",
//
"阿斯顿发发是的发生"])
//
view.show()
//
YHAppVersionForceUpdateView.alertView().show()
YHAppVersionForceUpdateView
.
alertView
()
.
show
()
return
}
#endif
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/V/YHMySettingCell.swift
View file @
8f074b7c
...
...
@@ -18,9 +18,26 @@ class YHMySettingCell: UITableViewCell {
label
.
textAlignment
=
.
left
label
.
numberOfLines
=
0
label
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
15
)
label
.
setContentCompressionResistancePriority
(
.
required
,
for
:
.
horizontal
)
return
label
}()
lazy
var
detailLabel
:
UILabel
=
{
let
label
=
UILabel
()
label
.
textColor
=
UIColor
(
hexString
:
"#141414"
)
label
.
textAlignment
=
.
right
label
.
font
=
UIFont
.
PFSC_R
(
ofSize
:
15
)
return
label
}()
private
lazy
var
redPointView
:
UIView
=
{
let
view
=
UIView
()
view
.
layer
.
cornerRadius
=
3.0
view
.
backgroundColor
=
.
failColor
view
.
isHidden
=
true
return
view
}()
lazy
var
arrowImgView
:
UIImageView
=
{
let
arrowImgView
=
UIImageView
(
image
:
UIImage
(
named
:
"mine_arrow_right"
))
return
arrowImgView
...
...
@@ -41,21 +58,33 @@ class YHMySettingCell: UITableViewCell {
contentView
.
backgroundColor
=
.
white
contentView
.
addSubview
(
titleLabel
)
contentView
.
addSubview
(
detailLabel
)
contentView
.
addSubview
(
redPointView
)
contentView
.
addSubview
(
arrowImgView
)
titleLabel
.
snp
.
makeConstraints
{
make
in
make
.
centerY
.
equalTo
(
contentView
)
make
.
centerY
.
equalTo
Superview
(
)
make
.
left
.
equalToSuperview
()
.
offset
(
20
)
make
.
right
.
equalTo
(
arrowImgView
.
snp
.
left
)
}
detailLabel
.
snp
.
makeConstraints
{
make
in
make
.
right
.
equalTo
(
arrowImgView
.
snp
.
left
)
.
offset
(
-
4
)
make
.
centerY
.
equalToSuperview
()
make
.
left
.
equalTo
(
redPointView
.
snp
.
right
)
.
offset
(
4
)
}
redPointView
.
snp
.
makeConstraints
{
make
in
make
.
width
.
height
.
equalTo
(
6
)
make
.
centerY
.
equalToSuperview
()
make
.
left
.
greaterThanOrEqualTo
(
titleLabel
.
snp
.
right
)
.
offset
(
4
)
}
arrowImgView
.
snp
.
makeConstraints
{
make
in
make
.
width
.
equalTo
(
20
)
make
.
height
.
equalTo
(
20
)
make
.
centerY
.
equalTo
(
contentView
)
make
.
centerY
.
equalTo
Superview
(
)
make
.
right
.
equalTo
(
contentView
)
.
offset
(
-
20
)
}
}
}
galaxy/galaxy/Classes/Modules/Mine(我的)/V/YHUserInfoHeaderView.swift
View file @
8f074b7c
...
...
@@ -159,6 +159,14 @@ class YHUserInfoHeaderView: UIView {
return
btn
}()
private
lazy
var
settingRedPointView
:
UIView
=
{
let
view
=
UIView
()
view
.
layer
.
cornerRadius
=
3.0
view
.
backgroundColor
=
.
failColor
view
.
isHidden
=
true
return
view
}()
private
lazy
var
settingView
:
UIView
=
{
let
view
=
UIView
()
return
view
...
...
@@ -198,6 +206,7 @@ class YHUserInfoHeaderView: UIView {
self
.
addSubview
(
bgImgView
)
self
.
addSubview
(
settingView
)
settingView
.
addSubview
(
settingBtn
)
settingView
.
addSubview
(
settingRedPointView
)
self
.
addSubview
(
avarImgView
)
self
.
addSubview
(
userNameLabel
)
...
...
@@ -232,6 +241,12 @@ class YHUserInfoHeaderView: UIView {
make
.
centerY
.
equalToSuperview
()
}
settingRedPointView
.
snp
.
makeConstraints
{
make
in
make
.
width
.
height
.
equalTo
(
6
)
make
.
left
.
equalTo
(
settingBtn
.
snp
.
right
)
.
offset
(
-
3
)
make
.
bottom
.
equalTo
(
settingBtn
.
snp
.
top
)
.
offset
(
3
)
}
avarImgView
.
snp
.
makeConstraints
{
make
in
make
.
size
.
equalTo
(
CGSize
(
width
:
72
,
height
:
72
))
make
.
top
.
equalTo
(
settingBtn
.
snp
.
bottom
)
.
offset
(
12
)
...
...
galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHAppVersionForceUpdateView.swift
View file @
8f074b7c
...
...
@@ -164,7 +164,7 @@ class YHAppVersionForceUpdateView: UIView {
@objc
func
didClickExitBtn
()
{
DispatchQueue
.
main
.
async
{
exit
(
1
)
exit
(
0
)
}
}
}
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