Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  登出

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -81,4 +81,27 @@ extension YHLoginViewModel {
             callBackBlock(false,err)
         }
     }
+    
+    func logout(_ callBackBlock: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
+
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Auth.logout
+        let _ = YHNetRequest.postRequest(url: strUrl) {
+            [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            printLog(json)
+            let dic = json.data
+            
+            if json.code == 200 {
+                callBackBlock(true, nil)
+                
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+            
+        } failBlock: { error in
+            callBackBlock(false, error)
+        }
+    }
 }

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

@@ -11,6 +11,7 @@ import SnapKit
 
 class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget {
     
+    let viewModel: YHLoginViewModel = YHLoginViewModel()
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style:.plain)
         tableView.contentInsetAdjustmentBehavior = .never
@@ -112,10 +113,27 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
     }
     
     @objc func logout() {
-        YHLoginManager.shared.clearUserInfo()
-        NotificationCenter.default.post(name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
-        YHHUD.flash(message: "退出成功")
-        self.navigationController?.popViewController(animated: true)
+        YHHUD.show(.progress(message: "退出登录中..."))
+        self.viewModel.logout() {
+            [weak self] success, error in
+            guard let self = self else { return }
+            YHHUD.hide()
+            if success {
+                DispatchQueue.main.async {
+                    YHHUD.flash(message: "退出成功")
+                    YHLoginManager.shared.clearUserInfo()
+                    NotificationCenter.default.post(name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
+                    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/Tools/NetWork/YHAllApiName.swift

@@ -162,6 +162,7 @@ class YHAllApiName {
     //登录
     struct Auth {
         static let login = "infoflow/auth/login"
+        static let logout = "infoflow/auth/logout"
     }
     
     //获取验证