Merge commit '7c995bf1' into xiezhaolin

# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -141,8 +141,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         }
         
         getData()
-        
-       
     }
     
     deinit {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift

@@ -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()
@@ -128,6 +129,14 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
                 }
                 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

@@ -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,6 +178,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     
     // 请求未读消息总数
     func getTotalUnreadMsgCount() {
+        if YHLoginManager.shared.isLogin() {
             self.msgViewModel.requestTotalUnreadMsgCount {
                 [weak self] success, error in
                 guard let self = self else { return }
@@ -193,6 +193,9 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
                     self.tableView .reloadData()
                 }
             }
+            
+        }
+        
     }
 }
 

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -288,12 +288,15 @@ class YHNetRequest: NSObject {
             printLog("服务器返回数据是：\(obj)")
 #endif
             if obj.code == 10010 {
-                // 跳转登录
+                DispatchQueue.main.async {
                     YHLoginManager.shared.clearUserInfo()
                     YHHUD.flash(message: "登录状态失效")
-                UIViewController.current?.navigationController?.popToRootViewController(animated: true)
+                    // 发送清空所有红点通知
+                    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 }