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
b1e91ec8
Commit
b1e91ec8
authored
Apr 19, 2024
by
pete谢兆麟
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
7c995bf1
' into xiezhaolin
# Conflicts: # galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
parents
1c4259e5
7c995bf1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
19 deletions
+32
-19
YHHomeWebViewController.swift
.../Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
+0
-2
YHMySettingViewController.swift
...lasses/Modules/Mine(我的)/C/YHMySettingViewController.swift
+9
-0
YHMyViewController.swift
...alaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
+14
-11
YHNetRequest.swift
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
+9
-6
No files found.
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
View file @
b1e91ec8
...
...
@@ -141,8 +141,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
}
getData
()
}
deinit
{
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMySettingViewController.swift
View file @
b1e91ec8
...
...
@@ -118,6 +118,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
YHHUD
.
hide
()
if
success
{
DispatchQueue
.
main
.
async
{
YHHUD
.
flash
(
message
:
"退出成功"
)
YHLoginManager
.
shared
.
clearUserInfo
()
...
...
@@ -127,6 +128,14 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
return
}
var
msg
=
"退出失败"
if
let
error
=
error
,
!
error
.
errorMsg
.
isEmpty
{
msg
=
error
.
errorMsg
}
YHHUD
.
flash
(
message
:
msg
)
}
}
}
...
...
galaxy/galaxy/Classes/Modules/Mine(我的)/C/YHMyViewController.swift
View file @
b1e91ec8
...
...
@@ -169,7 +169,6 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
}
func
requestLikeCollectionCount
()
{
self
.
likeViewModel
.
getLikeCollectionRecentScanCountInfo
{
[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
...
...
@@ -179,20 +178,24 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
// 请求未读消息总数
func
getTotalUnreadMsgCount
()
{
self
.
msgViewModel
.
requestTotalUnreadMsgCount
{
[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
DispatchQueue
.
main
.
async
{
let
count
=
self
.
msgViewModel
.
unreadTotalCount
for
item
in
self
.
items
{
if
item
.
type
==
.
myMessage
{
item
.
isShowRedPoint
=
count
>
0
break
if
YHLoginManager
.
shared
.
isLogin
()
{
self
.
msgViewModel
.
requestTotalUnreadMsgCount
{
[
weak
self
]
success
,
error
in
guard
let
self
=
self
else
{
return
}
DispatchQueue
.
main
.
async
{
let
count
=
self
.
msgViewModel
.
unreadTotalCount
for
item
in
self
.
items
{
if
item
.
type
==
.
myMessage
{
item
.
isShowRedPoint
=
count
>
0
break
}
}
self
.
tableView
.
reloadData
()
}
self
.
tableView
.
reloadData
()
}
}
}
}
...
...
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @
b1e91ec8
...
...
@@ -288,12 +288,15 @@ class YHNetRequest: NSObject {
printLog
(
"服务器返回数据是:
\(
obj
)
"
)
#endif
if
obj
.
code
==
10010
{
// 跳转登录
YHLoginManager
.
shared
.
clearUserInfo
()
YHHUD
.
flash
(
message
:
"登录状态失效"
)
UIViewController
.
current
?
.
navigationController
?
.
popToRootViewController
(
animated
:
true
)
goTabBarBy
(
tabType
:
.
home
)
YHHUD
.
hide
()
DispatchQueue
.
main
.
async
{
YHLoginManager
.
shared
.
clearUserInfo
()
YHHUD
.
flash
(
message
:
"登录状态失效"
)
// 发送清空所有红点通知
NotificationCenter
.
default
.
post
(
name
:
YhConstant
.
YhNotification
.
didMarkAllMessagesReadedNotifiction
,
object
:
nil
)
UIViewController
.
current
?
.
navigationController
?
.
popToRootViewController
(
animated
:
false
)
goTabBarBy
(
tabType
:
.
home
)
YHHUD
.
hide
()
}
return
}
guard
let
suclock
=
self
.
success
else
{
return
}
...
...
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