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
a595b873
Commit
a595b873
authored
Jul 31, 2024
by
DavidHuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成 灰度功能开发
parent
29ab53ca
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
27 deletions
+35
-27
project.pbxproj
galaxy/galaxy.xcodeproj/project.pbxproj
+8
-8
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+2
-0
YHUatHelper.swift
.../galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelper.swift
+8
-5
YHUatHelperViewModel.swift
...lasses/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift
+6
-2
YHNetRequest.swift
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
+11
-12
No files found.
galaxy/galaxy.xcodeproj/project.pbxproj
View file @
a595b873
...
...
@@ -4074,7 +4074,7 @@
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxyTestEnv.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
2
;
CURRENT_PROJECT_VERSION
=
1
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
...
...
@@ -4099,7 +4099,7 @@
"$(inherited)"
,
"@executable_path/Frameworks"
,
);
MARKETING_VERSION
=
0.9.
3
;
MARKETING_VERSION
=
0.9.
4
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
@@ -4215,7 +4215,7 @@
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxy.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
2
;
CURRENT_PROJECT_VERSION
=
1
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
...
...
@@ -4240,7 +4240,7 @@
"$(inherited)"
,
"@executable_path/Frameworks"
,
);
MARKETING_VERSION
=
0.9.
3
;
MARKETING_VERSION
=
0.9.
4
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
@@ -4419,7 +4419,7 @@
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxyDebug.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
2
;
CURRENT_PROJECT_VERSION
=
1
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
...
...
@@ -4444,7 +4444,7 @@
"$(inherited)"
,
"@executable_path/Frameworks"
,
);
MARKETING_VERSION
=
0.9.
3
;
MARKETING_VERSION
=
0.9.
4
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
@@ -4465,7 +4465,7 @@
CODE_SIGN_ENTITLEMENTS
=
galaxy/galaxy.entitlements
;
CODE_SIGN_IDENTITY
=
"Apple Development"
;
CODE_SIGN_STYLE
=
Automatic
;
CURRENT_PROJECT_VERSION
=
2
;
CURRENT_PROJECT_VERSION
=
1
;
DEVELOPMENT_TEAM
=
RXHYW88XR7
;
ENABLE_USER_SCRIPT_SANDBOXING
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
...
...
@@ -4490,7 +4490,7 @@
"$(inherited)"
,
"@executable_path/Frameworks"
,
);
MARKETING_VERSION
=
0.9.
3
;
MARKETING_VERSION
=
0.9.
4
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.intelligence.galaxy
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
a595b873
...
...
@@ -262,6 +262,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
//uat 添加items
func
loadItems
()
{
items
.
removeAll
()
if
YHUatHelper
.
shared
.
getUatModuleStatusBy
(
module
:
YHUatModules
(
rawValue
:
1
))
{
let
item
=
PersonalModuleItem
(
icon
:
"mine_item_card"
,
title
:
"我的名片"
.
local
,
type
:
.
myCard
)
items
.
append
(
item
)
...
...
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelper.swift
View file @
a595b873
...
...
@@ -119,11 +119,14 @@ extension YHUatHelper {
//加载服务器的uat配置
func
loadUatData
()
{
viewModel
.
getUatList
{
success
,
error
in
if
success
{
}
else
{
if
!
viewModel
.
isDataOk
{
viewModel
.
getUatList
{
success
,
error
in
if
success
{
}
else
{
}
}
}
}
...
...
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift
View file @
a595b873
...
...
@@ -22,7 +22,7 @@ class YHUatModel : HandyJSON {
默认不展示
7、服务-订单搜索、false
8、更新-强制更新弹窗、
fals
e
8、更新-强制更新弹窗、
tru
e
9、更新-建议更新弹窗、false
*/
var
module_number
:
String
=
""
...
...
@@ -41,6 +41,7 @@ class YHUatListModel : HandyJSON {
class
YHUatHelperViewModel
:
YHBaseViewModel
{
var
dataList
:
YHUatListModel
?
var
isDataOk
:
Bool
=
false
}
// MARK: - 共有方法
...
...
@@ -48,7 +49,7 @@ extension YHUatHelperViewModel {
//请求灰度功能列表配置
func
getUatList
(
callBackBlock
:
@escaping
(
_
success
:
Bool
,
_
error
:
YHErrorModel
?)
->
())
{
let
params
:
[
String
]
=
[
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"
8"
,
"
9"
]
let
params
:
[
String
]
=
[
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"9"
]
var
strUrl
=
YHBaseUrlManager
.
shared
.
curURL
()
+
YHAllApiName
.
Uat
.
uatListApi
for
(
index
,
item
)
in
params
.
enumerated
()
{
if
index
==
0
{
...
...
@@ -66,10 +67,13 @@ extension YHUatHelperViewModel {
callBackBlock
(
false
,
nil
)
return
}
self
.
isDataOk
=
true
self
.
dataList
=
resultModel
callBackBlock
(
true
,
nil
)
}
failBlock
:
{
err
in
self
.
isDataOk
=
false
callBackBlock
(
false
,
err
)
}
}
...
...
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @
a595b873
...
...
@@ -334,21 +334,20 @@ class YHNetRequest: NSObject {
printLog
(
"服务器返回数据是:
\(
obj
)
"
)
#endif
if
YHUatHelper
.
shared
.
getUatModuleStatusBy
(
module
:
YHUatModules
(
rawValue
:
8
))
{
if
obj
.
code
==
YHErrorCode
.
forceUpdate
.
rawValue
{
// 强制版本升级
DispatchQueue
.
main
.
async
{
YHAppVersionForceUpdateView
.
alertView
()
.
show
()
// 发送强制更新通知
NotificationCenter
.
default
.
post
(
name
:
YhConstant
.
YhNotification
.
didForceUpgradeNotifiction
,
object
:
nil
)
YHHUD
.
hide
()
guard
let
errorBlock
=
self
.
failure
else
{
return
}
let
errorModel
=
YHErrorModel
(
errorCode
:
Int32
(
statusCode
),
errorMsg
:
errorResponseMsg
)
errorBlock
(
errorModel
)
}
return
if
obj
.
code
==
YHErrorCode
.
forceUpdate
.
rawValue
{
// 强制版本升级
DispatchQueue
.
main
.
async
{
YHAppVersionForceUpdateView
.
alertView
()
.
show
()
// 发送强制更新通知
NotificationCenter
.
default
.
post
(
name
:
YhConstant
.
YhNotification
.
didForceUpgradeNotifiction
,
object
:
nil
)
YHHUD
.
hide
()
guard
let
errorBlock
=
self
.
failure
else
{
return
}
let
errorModel
=
YHErrorModel
(
errorCode
:
Int32
(
statusCode
),
errorMsg
:
errorResponseMsg
)
errorBlock
(
errorModel
)
}
return
}
if
obj
.
code
==
YHErrorCode
.
tokenInvalidError
.
rawValue
{
DispatchQueue
.
main
.
async
{
YHLoginManager
.
shared
.
clearUserInfo
()
...
...
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