文件名称修改

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -45,7 +45,7 @@
 		A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9042B4564F7002C94D2 /* Array+Extension.swift */; };
 		A5ACE9452B4564F7002C94D2 /* BsHUDContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9072B4564F7002C94D2 /* BsHUDContainerView.swift */; };
 		A5ACE9462B4564F7002C94D2 /* BsHUDSquareBaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9082B4564F7002C94D2 /* BsHUDSquareBaseView.swift */; };
-		A5ACE9472B4564F7002C94D2 /* BsHUD.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9092B4564F7002C94D2 /* BsHUD.swift */; };
+		A5ACE9472B4564F7002C94D2 /* YHHUD.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9092B4564F7002C94D2 /* YHHUD.swift */; };
 		A5ACE9482B4564F7002C94D2 /* BsHUDWariningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE90A2B4564F7002C94D2 /* BsHUDWariningView.swift */; };
 		A5ACE9492B4564F7002C94D2 /* BsHUDSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE90B2B4564F7002C94D2 /* BsHUDSuccessView.swift */; };
 		A5ACE94A2B4564F7002C94D2 /* BsHUDProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE90C2B4564F7002C94D2 /* BsHUDProgressView.swift */; };
@@ -129,7 +129,7 @@
 		A5ACE9042B4564F7002C94D2 /* Array+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extension.swift"; sourceTree = "<group>"; };
 		A5ACE9072B4564F7002C94D2 /* BsHUDContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BsHUDContainerView.swift; sourceTree = "<group>"; };
 		A5ACE9082B4564F7002C94D2 /* BsHUDSquareBaseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BsHUDSquareBaseView.swift; sourceTree = "<group>"; };
-		A5ACE9092B4564F7002C94D2 /* BsHUD.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BsHUD.swift; sourceTree = "<group>"; };
+		A5ACE9092B4564F7002C94D2 /* YHHUD.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHUD.swift; sourceTree = "<group>"; };
 		A5ACE90A2B4564F7002C94D2 /* BsHUDWariningView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BsHUDWariningView.swift; sourceTree = "<group>"; };
 		A5ACE90B2B4564F7002C94D2 /* BsHUDSuccessView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BsHUDSuccessView.swift; sourceTree = "<group>"; };
 		A5ACE90C2B4564F7002C94D2 /* BsHUDProgressView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BsHUDProgressView.swift; sourceTree = "<group>"; };
@@ -397,7 +397,7 @@
 			children = (
 				A5ACE9072B4564F7002C94D2 /* BsHUDContainerView.swift */,
 				A5ACE9082B4564F7002C94D2 /* BsHUDSquareBaseView.swift */,
-				A5ACE9092B4564F7002C94D2 /* BsHUD.swift */,
+				A5ACE9092B4564F7002C94D2 /* YHHUD.swift */,
 				A5ACE90A2B4564F7002C94D2 /* BsHUDWariningView.swift */,
 				A5ACE90B2B4564F7002C94D2 /* BsHUDSuccessView.swift */,
 				A5ACE90C2B4564F7002C94D2 /* BsHUDProgressView.swift */,
@@ -732,7 +732,7 @@
 				A5ACE9342B4564F7002C94D2 /* YHAllApiName.swift in Sources */,
 				A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */,
 				A5ACE93F2B4564F7002C94D2 /* UIViewController+Extension.swift in Sources */,
-				A5ACE9472B4564F7002C94D2 /* BsHUD.swift in Sources */,
+				A5ACE9472B4564F7002C94D2 /* YHHUD.swift in Sources */,
 				A5ACE9412B4564F7002C94D2 /* Dictionary+Extension.swift in Sources */,
 				A5ACE9312B4564F7002C94D2 /* YHPersonalCenterCell.swift in Sources */,
 				A5ACE9532B4564F7002C94D2 /* YHBaseViewController.swift in Sources */,

galaxy/galaxy/Classes/Tools/Helper/BsHUD/BsHUD.swift → galaxy/galaxy/Classes/Tools/Helper/BsHUD/YHHUD.swift

@@ -18,7 +18,7 @@ public enum BsHUDType {
     case rotatingImage(image: UIImage?, message: String?)
 }
 
-class BsHUD {
+class YHHUD {
     // MARK: Properties
     public static var dimsBackground: Bool {
         get { return PKHUD.sharedHUD.dimsBackground }
@@ -55,20 +55,20 @@ class BsHUD {
         let keyWindow = UIApplication.shared.windows.first {$0.isKeyWindow}
 
         if keyWindow != nil {
-            while(keyWindow!.viewWithTag(BsHUD.flashMessageTag) != nil){
-                keyWindow!.viewWithTag(BsHUD.flashMessageTag)?.removeFromSuperview()
+            while(keyWindow!.viewWithTag(YHHUD.flashMessageTag) != nil){
+                keyWindow!.viewWithTag(YHHUD.flashMessageTag)?.removeFromSuperview()
             }
         }
     }
     
     // MARK: Public methods, HUD based
     public static func flash(_ content: BsHUDType, onView view: UIView? = nil) {
-		BsHUD.flash(content, onView: view, delay: 1, completion: nil)
+		YHHUD.flash(content, onView: view, delay: 1, completion: nil)
     }
     
     public static func flash(_ content: BsHUDType, onView view: UIView? = nil, delay: TimeInterval, completion: ((Bool) -> Void)? = nil) {
-        BsHUD.show(content, onView: view)
-        BsHUD.hide(afterDelay: delay, completion: completion)
+        YHHUD.show(content, onView: view)
+        YHHUD.hide(afterDelay: delay, completion: completion)
     }
     
     // MARK: Private methods
@@ -92,7 +92,7 @@ class BsHUD {
     }
 }
 
-extension BsHUD{
+extension YHHUD{
     static func setup(){
         PKHUD.sharedHUD.effect = nil
 //        PKHUD.sharedHUD.gracePeriod = 0.5
@@ -100,7 +100,7 @@ extension BsHUD{
 }
 
 
-extension BsHUD{
+extension YHHUD{
     static let flashMessageTag = 61535
     static func flash(message: String,
                       dismissAfter: TimeInterval = 1.5,

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -20,7 +20,6 @@ class YHBaseUrlManager {
     //正式环境
     static let baseUrlRelease : String = "https://api.health.sleep321.com/"
     
-    
     //h5开发环境
     static let h5UrlDev : String = "https://cdn.sleep321.com/trial/"
     

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

@@ -34,8 +34,8 @@ class YHNetRequest: NSObject {
     }
     ///  请求类型
     func requestType(_ type: HTTPMethod) -> Self {
-         self.requestType = type
-         return self
+        self.requestType = type
+        return self
     }
     ///请求参数
     func params(_params: [String:Any]?) -> Self {
@@ -62,9 +62,9 @@ class YHNetRequest: NSObject {
             requestHeader.add(name:"Accept",value:"application/json")
         }
         return requestHeader
-    } 
+    }
     ///开始请求
-
+    
     func startRequest() -> Request? {
         let requestHeaders = getHeader()
         ///不使用缓存
@@ -73,7 +73,9 @@ class YHNetRequest: NSObject {
         httpRequest = AF.request(self.url!,method: self.requestType,parameters: self.params,encoding: URLEncoding(destination: .queryString),headers: requestHeaders,interceptor: nil,requestModifier: nil)
         _ = httpRequest?.id
         httpRequest?.responseString(encoding:.utf8,completionHandler: { string in
-            print("=======2")
+            #if DEBUG
+            print("\n网络请求已返回 string=\(string)")
+            #endif
             self.completeHandle(string: string)
         })
         return httpRequest
@@ -81,7 +83,6 @@ class YHNetRequest: NSObject {
     /// 请求response完成处理
     func completeHandle(string: AFDataResponse<String>) {
         let responseResult = string.result
-//        var resultFlag: Bool = false
         let errorCodeStr = "0"
         var statusCode = string.response?.statusCode ?? 0
         let errorResponseMsg = string.error?.localizedDescription ?? ""
@@ -90,10 +91,8 @@ class YHNetRequest: NSObject {
         let serverDict = resultValue.toDictionary()
         switch responseResult {
         case .success:
-//            resultFlag = true
             break
         case .failure:
-//            resultFlag = false
             if let underyingError = string.error?.asAFError?.underlyingError {
                 if let urlError = underyingError as? URLError {
                     switch urlError.code{
@@ -113,22 +112,18 @@ class YHNetRequest: NSObject {
             break
         }
         
-        
-        
-        
         if statusCode == 200 {
-            if let suclock = self.success {
-                suclock(serverDict,statusCode)
-            }
+            guard let suclock = self.success else { return }
+            suclock(serverDict,statusCode)
         } else {
             let errorModel = YHNetErrorModel.init()
             errorModel.responseErrorType = .failType
-            if let errorBlock = self.failure {
-                errorModel.responseStatusCode = statusCode
-                errorModel.errResponseMsg = errorResponseMsg
-                errorModel.errReaponseCode = errorCodeStr
-                errorBlock(errorModel)
-            }
+            
+            guard let errorBlock = self.failure else { return }
+            errorModel.responseStatusCode = statusCode
+            errorModel.errResponseMsg = errorResponseMsg
+            errorModel.errReaponseCode = errorCodeStr
+            errorBlock(errorModel)
         }
     }
 }
@@ -149,7 +144,7 @@ class YHNetErrorModel {
     var errResponseMsg: String = ""
     var errReaponseCode: String = ""
     var errReaponseTimeOutCode: Int = 0
-    var responseErrorType: NetResponseErrorType?
+    var responseErrorType: NetResponseErrorType = .failType
 }
 
 enum NetResponseErrorType: Int {

galaxy/galaxy/Classes/Tools/NetWork/YHNetworkStatusManager.swift

@@ -14,45 +14,45 @@ class YHNetworkStatusManager {
     static let shared = YHNetworkStatusManager()
     var reachability: Reachability!
     init(){
-       do {
-           reachability = try Reachability()
-
-           reachability.whenReachable = { reachability in
-               if reachability.connection == .wifi {
-                   print("Reachable via WiFi2")
-                   BsHUD.flash(message: "当前网络: wifi")
-               } else {
-                   print("Reachable via Cellular")
-                   BsHUD.flash(message: "当前网络: Cellular")
-               }
-           }
-           reachability.whenUnreachable = { _ in
-               print("Not reachable")
-               BsHUD.flash(message: "当前网络不可用")
-           }
-       } catch {
-           print("Unable to create Reachability")
-           return
-       }
+        do {
+            reachability = try Reachability()
+            
+            reachability.whenReachable = { reachability in
+                if reachability.connection == .wifi {
+                    print("Reachable via WiFi2")
+                    YHHUD.flash(message: "当前网络: wifi")
+                } else {
+                    print("Reachable via Cellular")
+                    YHHUD.flash(message: "当前网络: Cellular")
+                }
+            }
+            reachability.whenUnreachable = { _ in
+                print("Not reachable")
+                YHHUD.flash(message: "当前网络不可用")
+            }
+        } catch {
+            print("Unable to create Reachability")
+            return
+        }
     }
-
+    
     var isNetWorkOK : Bool {
         if reachability.connection != .unavailable {
             return true
         } else {
             print("网络连接：不可用")
             return false
-
+            
         }
     }
-
+    
     var netType : Reachability.Connection {
         return reachability.connection
     }
-
-
-
-
+    
+    
+    
+    
     func listenNetWorkStatus() {
         NotificationCenter.default.addObserver(self, selector: #selector(reachabilityChanged(note:)), name: .reachabilityChanged, object: reachability)
         do{
@@ -61,22 +61,18 @@ class YHNetworkStatusManager {
             print("could not start reachability notifier")
         }
     }
-
-
+    
+    
     @objc func reachabilityChanged(note: Notification) {
         switch reachability.connection {
-            case .wifi:
-                print("Reachable via WiFi1")
-            case .cellular:
-                print("Reachable via Cellular")
-            case .unavailable:
-                print("Network not reachable")
-            case .none:
-                print(".none")
+        case .wifi:
+            print("Reachable via WiFi1")
+        case .cellular:
+            print("Reachable via Cellular")
+        case .unavailable:
+            print("Network not reachable")
+        case .none:
+            print(".none")
         }
     }
-
-
-
-
 }