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

galaxy/galaxy/AppDelegate.swift

@@ -54,8 +54,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         
         YHOSSManager.share.getOSSID()
         
-        
-        
         //1.设置主窗口
         setupRootVC()
         return true

galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginManager.swift

@@ -56,6 +56,9 @@ extension YHOneKeyLoginManager {
     }
     
     func configOneKeyLogin() {
+        if YHNetworkStatusManager.shared.isNetWorkOK == false {
+            return
+        }
         
         self.viewModel.getSecretKeyInfo {
             secretKey in

galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift

@@ -45,6 +45,10 @@ class YHOSSManager: NSObject, URLSessionDelegate {
     }
     
     func getOSSID(completionHandler: (() -> Void)? = nil) {
+        if YHNetworkStatusManager.shared.isNetWorkOK == false {
+            return
+        }
+        
         let param: [String: Any] = ["path": "*"]
         let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.getID
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in