fix bug

无故事王国

2024-07-26 e6636384e031aab3c38710c5d996c2e0d54e8860

 WanPai/Network/NetworkRequest.swift

@@ -190,7 +190,7 @@

        return Observable<BaseResponse<T>>.create{ ob in
            guard NetworkReachabilityManager.init(host: All_Url)!.isReachable else {
                alertError(msg: "当前网络不可用")
//                                                alertError(msg: "当前网络不可用")
                ob.onError(AFError.invalidURL(url: params.url))
                return Disposables.create{}
            }
@@ -261,144 +261,6 @@
            return Disposables.create{}
        }
    }
    
//    class func requestData(params: ParamsAppender, method: HTTPMethod, encoding: ParameterEncoding? = nil, progress: Bool = true) -> Observable<Data>{
//        return Observable<Data>.create{ ob in
//            if progress {
//                SVProgressHUD.show()
//            }
//
//            var headers = HTTPHeaders()
//                //            if let token = UserViewModel.getUserInfo()?.token {
//                //                headers.add(name: "Authorization", value: "Bearer" + " " + token)
//                //                LogInfo("USER_token:\(token)")
//                //            }
//            if encoding is JSONEncoding {
//                headers.add(name: "Content-Type", value: "application/json;charset=UTF-8")
//            }
//
//            var newEncoding: ParameterEncoding
//            if encoding != nil {
//                newEncoding = encoding!
//            } else {
//                newEncoding = method == .post ? URLEncoding.httpBody : URLEncoding.queryString
//            }
//
//            sharedSessionManager.request(params.url.absoluteString, method: method, parameters: params.done(), encoding: newEncoding, headers: headers).validate().responseData{response in
//                LogInfo("请求地址:\(params.url)")
//                LogInfo("请求参数:\(params.params)")
//                SVProgressHUD.dismiss()
//                if response.error != nil {
//                    LogError("\(response.error!)")
//                    ob.onError(response.error!)
//                }else if let data = response.data{
//                    LogInfo("返回数据:\(data)")
//                    ob.onNext(data)
//                }
//                ob.onCompleted()
//            }
//            return Disposables.create{}
//        }
//    }
//
//        /// 带code请求的
//        /// - Parameters:
//        ///   - params: <#params description#>
//        ///   - method: <#method description#>
//        ///   - progress: <#progress description#>
//        /// - Returns: <#description#>
//    class func requestCode<T: HandyJSON>(params: ParamsAppender,method: HTTPMethod,progress: Bool = true) -> Observable<BaseResponse<T>>{
//        return Observable<BaseResponse<T>>.create{ ob in
//            if progress {
//                SVProgressHUD.show()
//            }
//            sharedSessionManager.request(params.url.absoluteString, method: method, parameters:
//                                            params.done(),encoding: URLEncoding.default).validate().responseData{response in
//                LogInfo("请求地址:\(params.url)")
//                LogInfo("请求参数:\(params.params)")
//                if response.error != nil {
//                    SVProgressHUD.dismiss()
//                    LogInfo("\(response.error!)")
//                    ob.onError(response.error!)
//                }else if let data = response.data,let jsonString = String(data: data, encoding: String.Encoding.utf8){
//
//                    SVProgressHUD.dismiss()
//                    LogInfo("返回数据:\(jsonString)")
//                    if let next = BaseResponse<T>.deserialize(from: jsonString){
//                        ob.onNext(next)
//                    }else{
//                        SVProgressHUD.dismiss()
//                            //                            alert(msg: "请求失败")
//                        LogInfo("error")
//                    }
//                }else{
//                    SVProgressHUD.dismiss()
//                        //                        alert(msg: "请求失败")
//                    LogInfo("Netrequest-Tag:No data")
//                }
//                ob.onCompleted()
//            }
//            return Disposables.create{}
//        }
//    }
//        /// 上传
//        /// - Parameter params: <#params description#>
//    class func upload<T: HandyJSON>(params: ParamsAppender) -> Observable<BaseResponse<T>> {
//        return Observable<BaseResponse<T>>.create{ob in
//                //            let hud = MBProgressHUD.showAdded(to: screnDelegate!.window!, animated: true)
//                //            hud.bezelView.style = .solidColor
//                //            hud.contentColor = .white
//                //            hud.bezelView.backgroundColor = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 0.8)
//                //            hud.bezelView.color = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 0.8)
//                //            hud.removeFromSuperViewOnHide = true
//
//            var headers = HTTPHeaders()
//                //            if let token = UserViewModel.getUserInfo()?.token {
//                //                headers.add(name: "Authorization", value: "Bearer" + " " + token)
//                //                LogInfo("USER_token:\(token)")
//                //            }
//
//
//            AF.upload(multipartFormData: { data in
//                let p = params
//                LogInfo("Netrequest-Upload-Starting.")
//                for key in p.params{
//                    if let d = key.value as? Data {
//                        LogInfo("Netrequest-Upload-Appending-Data: Length = \(d.count) bytes")
//
//                        data.append(d, withName: key.key, fileName: "\(Date().timeIntervalSince1970).png", mimeType: "image/png")
//                    } else if let url = key.value as? URL {
//                        LogInfo("Netrequest-Upload-Appending-Data: Url = \(url)")
//                        data.append(url, withName: key.key)
//                    }
//                }
//            }, to: params.url, method: .post, headers: headers) .uploadProgress(queue: .main, closure: { progress in
//                    //                progressClosure(progress.fractionCompleted)
//            }).responseJSON(completionHandler: { data in
//                print("upload finished: \(data)")
//
//            }).response { (response) in
//
//                    //                hud.hide(animated: true)
//                switch response.result {
//                    case .success(let dataObj):
//                            //                    alert(msg: "上传成功")
//                        let jsonString = String(data: dataObj ?? Data(), encoding: String.Encoding.utf8)
//                        if let next = BaseResponse<T>.deserialize(from: jsonString){
//                            ob.onNext(next)
//                        }
//                    case .failure(let err):
//                        alert(msg: "上传失败")
//                        print("upload err: \(err)")
//                }
//
//            }
//            return Disposables.create{
//
//            }
//
//        }
//    }
}
extension Dictionary {
    mutating func append(dict: Dictionary) {