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
ab979c0c
Commit
ab979c0c
authored
Mar 15, 2024
by
David黄金龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、删除 for test hjl
2、处理 主申请 下一个 的渐变色
parent
0aac9cb3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
21 additions
and
49 deletions
+21
-49
AppDelegate.swift
galaxy/galaxy/AppDelegate.swift
+11
-16
YHHomeViewController.swift
...axy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift
+3
-12
YHMainApplicantInformationViewController.swift
...(主申请人信息)/C/YHMainApplicantInformationViewController.swift
+3
-2
YHBottomNextView.swift
...MainApplicantInformation(主申请人信息)/V/YHBottomNextView.swift
+0
-5
YHPreviewInfoCertificateInformationItemsView.swift
...息预览)/V/YHPreviewInfoCertificateInformationItemsView.swift
+1
-1
YHPreviewInfoProjectItemView.swift
...rsonInfoList(个人信息预览)/V/YHPreviewInfoProjectItemView.swift
+1
-1
YHSubmintAllInfoSuccessTipView.swift
...igentService(服务中心)/V/YHSubmintAllInfoSuccessTipView.swift
+1
-1
YHAboutUsViewController.swift
.../Classes/Modules/Mine(我的)/C/YHAboutUsViewController.swift
+1
-1
YHNetRequest.swift
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
+0
-10
No files found.
galaxy/galaxy/AppDelegate.swift
View file @
ab979c0c
...
@@ -46,14 +46,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
...
@@ -46,14 +46,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// YHAnalytics.analyticsStart(launchOptions: launchOptions)
// YHAnalytics.analyticsStart(launchOptions: launchOptions)
// var i = 0
// var i = 0
// for family: String in UIFont.familyNames {
// for family: String in UIFont.familyNames {
// print("\(i)---项目字体---\(family)")
// print("\(i)---项目字体---\(family)")
// for names: String in UIFont.fontNames(forFamilyName: family) {
// for names: String in UIFont.fontNames(forFamilyName: family) {
// print("== \(names)")
// print("== \(names)")
// }
// }
// i += 1
// i += 1
// }
// }
return
true
return
true
}
}
...
@@ -81,13 +81,11 @@ extension AppDelegate {
...
@@ -81,13 +81,11 @@ extension AppDelegate {
//1.数据解析
//1.数据解析
#if DEBUG
#if DEBUG
// SmartConfig.debugMode = .verbose
SmartConfig
.
debugMode
=
.
none
SmartConfig
.
debugMode
=
.
none
//for test hjl
#else
#else
SmartConfig
.
debugMode
=
.
none
SmartConfig
.
debugMode
=
.
none
#endif
#endif
//2.bugly参数设置
//2.bugly参数设置
#if DEBUG
#if DEBUG
Bugly
.
start
(
withAppId
:
"3b10faa43e"
)
Bugly
.
start
(
withAppId
:
"3b10faa43e"
)
...
@@ -133,17 +131,14 @@ extension AppDelegate {
...
@@ -133,17 +131,14 @@ extension AppDelegate {
private
func
setupRootVC
()
{
private
func
setupRootVC
()
{
let
tabBarController
=
YHTabBarViewController
()
let
tabBarController
=
YHTabBarViewController
()
let
v0
=
YHNavigationController
(
rootVC
:
YHHomeViewController
())
let
v0
=
YHNavigationController
(
rootVC
:
YHHomeViewController
())
// let v0 = YHNavigationController(rootVC:YHPersonInformMainViewController())//for test hjl
let
v1
=
YHNavigationController
(
rootVC
:
YHServiceCenterMainViewController
())
let
v1
=
YHNavigationController
(
rootVC
:
YHServiceCenterMainViewController
())
let
v2
=
YHNavigationController
(
rootVC
:
YHMyViewController
())
let
v2
=
YHNavigationController
(
rootVC
:
YHMyViewController
())
v0
.
tabBarItem
=
ESTabBarItem
.
init
(
YHBasicContentView
(),
title
:
"首页"
,
image
:
UIImage
(
named
:
"photo"
),
selectedImage
:
UIImage
(
named
:
"photo_1"
))
v0
.
tabBarItem
=
ESTabBarItem
.
init
(
YHBasicContentView
(),
title
:
"首页"
,
image
:
UIImage
(
named
:
"photo"
),
selectedImage
:
UIImage
(
named
:
"photo_1"
))
v1
.
tabBarItem
=
ESTabBarItem
.
init
(
YHBasicContentView
(),
title
:
"服务中心"
,
image
:
UIImage
(
named
:
"home"
),
selectedImage
:
UIImage
(
named
:
"home_1"
))
v1
.
tabBarItem
=
ESTabBarItem
.
init
(
YHBasicContentView
(),
title
:
"服务中心"
,
image
:
UIImage
(
named
:
"home"
),
selectedImage
:
UIImage
(
named
:
"home_1"
))
v2
.
tabBarItem
=
ESTabBarItem
.
init
(
YHBasicContentView
(),
title
:
"我的"
,
image
:
UIImage
(
named
:
"find"
),
selectedImage
:
UIImage
(
named
:
"find_1"
))
v2
.
tabBarItem
=
ESTabBarItem
.
init
(
YHBasicContentView
(),
title
:
"我的"
,
image
:
UIImage
(
named
:
"find"
),
selectedImage
:
UIImage
(
named
:
"find_1"
))
tabBarController
.
viewControllers
=
[
v0
,
v1
,
v2
]
//
tabBarController.viewControllers = [v0,v1,v2]
// tabBarController.viewControllers = [v1,v2]
for test hjl 配合测试同学做自动化测试 Moon 2023.03.12
tabBarController
.
viewControllers
=
[
v1
,
v2
]
//
for test hjl 配合测试同学做自动化测试 Moon 2023.03.12
tabBarController
.
tabBar
.
backgroundColor
=
.
white
tabBarController
.
tabBar
.
backgroundColor
=
.
white
window
=
UIWindow
(
frame
:
UIScreen
.
main
.
bounds
)
window
=
UIWindow
(
frame
:
UIScreen
.
main
.
bounds
)
...
...
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift
View file @
ab979c0c
...
@@ -137,13 +137,6 @@ class YHHomeViewController: YHBaseViewController {
...
@@ -137,13 +137,6 @@ class YHHomeViewController: YHBaseViewController {
//1.UI
//1.UI
initView
()
initView
()
//2.网络请求
// requestData()
//for test hjl
// testModelParse()//for test hjl 添加 数据类型 转换
// testModelParse()//for test hjl 添加 数据类型 转换
}
}
...
@@ -272,11 +265,11 @@ extension YHHomeViewController {
...
@@ -272,11 +265,11 @@ extension YHHomeViewController {
self
.
homeTableView
.
es
.
addPullToRefresh
{
self
.
homeTableView
.
es
.
addPullToRefresh
{
self
.
loadFirstItem
()
//for test hjl
self
.
loadFirstItem
()
}
}
self
.
homeTableView
.
es
.
startPullToRefresh
()
self
.
homeTableView
.
es
.
startPullToRefresh
()
self
.
homeTableView
.
es
.
addInfiniteScrolling
{
self
.
homeTableView
.
es
.
addInfiniteScrolling
{
self
.
loadFakeData
()
//for test hjl
self
.
loadFakeData
()
}
}
}
}
...
@@ -312,9 +305,7 @@ extension YHHomeViewController : UITableViewDelegate,UITableViewDataSource {
...
@@ -312,9 +305,7 @@ extension YHHomeViewController : UITableViewDelegate,UITableViewDataSource {
if
section
==
0
{
if
section
==
0
{
return
6
return
6
}
}
return
1
//for test hjl
return
1
// return 0 //for test hjl
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift
View file @
ab979c0c
...
@@ -133,11 +133,12 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
...
@@ -133,11 +133,12 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
}()
}()
view
.
addSubview
(
bottomView
)
view
.
addSubview
(
bottomView
)
bottomView
.
snp
.
makeConstraints
{
make
in
bottomView
.
snp
.
makeConstraints
{
make
in
make
.
left
.
right
.
bottom
.
equalTo
(
view
)
make
.
left
.
right
.
bottom
.
equalTo
Superview
(
)
make
.
height
.
equalTo
(
k_Height_safeAreaInsetsBottom
()
+
64
)
make
.
height
.
equalTo
(
k_Height_safeAreaInsetsBottom
()
+
64
)
}
}
bottomView
.
layoutIfNeeded
()
bottomView
.
nextButton
.
addYinHeGradualLayer
()
}
}
}
}
extension
YHMainApplicantInformationViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
extension
YHMainApplicantInformationViewController
:
UITableViewDelegate
,
UITableViewDataSource
{
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHBottomNextView.swift
View file @
ab979c0c
...
@@ -54,8 +54,6 @@ class YHBottomNextView: UIView {
...
@@ -54,8 +54,6 @@ class YHBottomNextView: UIView {
button
.
layer
.
cornerRadius
=
kCornerRadius6
button
.
layer
.
cornerRadius
=
kCornerRadius6
button
.
clipsToBounds
=
true
button
.
clipsToBounds
=
true
button
.
addTarget
(
self
,
action
:
#selector(
goNext
)
,
for
:
.
touchUpInside
)
button
.
addTarget
(
self
,
action
:
#selector(
goNext
)
,
for
:
.
touchUpInside
)
button
.
backgroundColor
=
.
brandMainColor
//for test hjl
return
button
return
button
}()
}()
addSubview
(
nextButton
)
addSubview
(
nextButton
)
...
@@ -65,9 +63,6 @@ class YHBottomNextView: UIView {
...
@@ -65,9 +63,6 @@ class YHBottomNextView: UIView {
make
.
height
.
equalTo
(
44
)
make
.
height
.
equalTo
(
44
)
make
.
left
.
equalTo
(
saveButton
.
snp
.
right
)
.
offset
(
10
)
make
.
left
.
equalTo
(
saveButton
.
snp
.
right
)
.
offset
(
10
)
}
}
nextButton
.
layoutIfNeeded
()
nextButton
.
addYinHeGradualLayer
()
//for test hjl
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoCertificateInformationItemsView.swift
View file @
ab979c0c
...
@@ -62,7 +62,7 @@ extension YHPreviewInfoCertificateInformationItemsView {
...
@@ -62,7 +62,7 @@ extension YHPreviewInfoCertificateInformationItemsView {
if
index
==
0
{
if
index
==
0
{
//第一个
//第一个
cellView
.
snp
.
makeConstraints
{
make
in
cellView
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
tmp
.
snp
.
bottom
)
.
offset
(
10
)
//for test hjl
make
.
top
.
equalTo
(
tmp
.
snp
.
bottom
)
.
offset
(
10
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
right
.
equalToSuperview
()
.
offset
(
-
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
make
.
left
.
equalToSuperview
()
.
offset
(
18
)
}
}
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoProjectItemView.swift
View file @
ab979c0c
...
@@ -67,7 +67,7 @@ extension YHPreviewInfoProjectItemView {
...
@@ -67,7 +67,7 @@ extension YHPreviewInfoProjectItemView {
}
}
let
tagView
:
UIView
=
UIView
()
let
tagView
:
UIView
=
UIView
()
tagView
.
backgroundColor
=
.
failColor
//for test hjl
tagView
.
backgroundColor
=
.
failColor
holdView
.
addSubview
(
tagView
)
holdView
.
addSubview
(
tagView
)
if
lastTagView
==
nil
{
if
lastTagView
==
nil
{
tagView
.
snp
.
makeConstraints
{
make
in
tagView
.
snp
.
makeConstraints
{
make
in
...
...
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmintAllInfoSuccessTipView.swift
View file @
ab979c0c
...
@@ -131,7 +131,7 @@ class YHSubmintAllInfoSuccessTipView: UIView {
...
@@ -131,7 +131,7 @@ class YHSubmintAllInfoSuccessTipView: UIView {
label
.
numberOfLines
=
1
label
.
numberOfLines
=
1
return
label
return
label
}()
}()
messageLabel
.
backgroundColor
=
.
clear
//for test hjl
messageLabel
.
backgroundColor
=
.
clear
centerView
.
addSubview
(
messageLabel
)
centerView
.
addSubview
(
messageLabel
)
messageLabel
.
snp
.
makeConstraints
{
make
in
messageLabel
.
snp
.
makeConstraints
{
make
in
make
.
top
.
equalTo
(
lable2
.
snp
.
bottom
)
.
offset
(
10
)
make
.
top
.
equalTo
(
lable2
.
snp
.
bottom
)
.
offset
(
10
)
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHAboutUsViewController.swift
View file @
ab979c0c
...
@@ -43,7 +43,7 @@ class YHAboutUsViewController: YHBaseViewController {
...
@@ -43,7 +43,7 @@ class YHAboutUsViewController: YHBaseViewController {
collectinoView
.
register
(
YHAboutUsAdvantageCell
.
self
,
forCellWithReuseIdentifier
:
YHAboutUsAdvantageCell
.
cellReuseIdentifier
)
collectinoView
.
register
(
YHAboutUsAdvantageCell
.
self
,
forCellWithReuseIdentifier
:
YHAboutUsAdvantageCell
.
cellReuseIdentifier
)
collectinoView
.
delegate
=
self
collectinoView
.
delegate
=
self
collectinoView
.
dataSource
=
self
collectinoView
.
dataSource
=
self
collectinoView
.
backgroundColor
=
.
clear
//for test hjl
collectinoView
.
backgroundColor
=
.
clear
return
collectinoView
return
collectinoView
}()
}()
...
...
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @
ab979c0c
...
@@ -78,11 +78,6 @@ class YHNetRequest: NSObject {
...
@@ -78,11 +78,6 @@ class YHNetRequest: NSObject {
requestHeader
.
add
(
name
:
"Conatent-Type"
,
value
:
"application/json"
)
requestHeader
.
add
(
name
:
"Conatent-Type"
,
value
:
"application/json"
)
requestHeader
.
add
(
name
:
"Accept"
,
value
:
"application/json"
)
requestHeader
.
add
(
name
:
"Accept"
,
value
:
"application/json"
)
/*
以下是测试数据 for test hjl
*/
requestHeader
.
add
(
name
:
"appid"
,
value
:
"1"
)
requestHeader
.
add
(
name
:
"appid"
,
value
:
"1"
)
let
dateStr
=
String
(
Date
()
.
timeIntervalSince1970
)
let
dateStr
=
String
(
Date
()
.
timeIntervalSince1970
)
requestHeader
.
add
(
name
:
"timestamp"
,
value
:
dateStr
)
requestHeader
.
add
(
name
:
"timestamp"
,
value
:
dateStr
)
...
@@ -98,11 +93,6 @@ class YHNetRequest: NSObject {
...
@@ -98,11 +93,6 @@ class YHNetRequest: NSObject {
headers
=
requestHeader
headers
=
requestHeader
}
}
// private func testToken(_ requestHeader:inout HTTPHeaders) {
// //金龙的账号
// requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE")
// }
/// 链式语法
/// 链式语法
func
url
(
_
url
:
String
?)
->
Self
{
func
url
(
_
url
:
String
?)
->
Self
{
self
.
url
=
url
??
""
self
.
url
=
url
??
""
...
...
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