新版本

younger_times

2023-08-16 aec51d7dba8960905c0bfeb9e94689c96aeb721c

 BrokerDriver/Network/NetworkRequest.swift

@@ -110,11 +110,26 @@
        return self.params
    }

   func googleRoleMapDone() -> Parameters {
      var paramsArray: [String] = []
         // 排序 sort
      let sortedArray: [String] = Array(params.keys).sorted()
      for item in sortedArray{
            // 拼接字符串 Stitch strings
         if params.has(key: item){
            paramsArray.append("\(item)=\(params[item]!)")
         }
      }
      let content = paramsArray.joined(separator: "&")
      params += ["key": GoogleAppKey]
      return params
   }

    class func build(url: String) -> ParamsAppender {
        return ParamsAppender(url: url)
    }

    func googleMapDone() -> ParamsAppender {
   func googleMapDone(has:Bool = true) -> ParamsAppender {
        var paramsArray: [String] = []
        // 排序
        let sortedArray: [String] = Array(params.keys).sorted()
@@ -127,7 +142,10 @@
        let content = paramsArray.joined(separator: "&")
        params += ["key": GoogleAppKey]
        //https://developers.google.com/maps/faq#languagesupport
        params += ["language":"en"]

      if has{
         params += ["language":"en"]
      }

        return self
    }
@@ -254,6 +272,50 @@
      }
   }

//   class func requestRoad<T: HandyJSON>(params: ParamsAppender, method: HTTPMethod,  encoding: ParameterEncoding? = nil, progress: Bool = true) -> Observable<T>{
//      return Observable<T>.create{ ob in
//         var hud: MBProgressHUD?
//         if progress {
//            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 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).validate().responseData{response in
//            LogInfo("请求地址:\(params.url)")
//            LogInfo("请求参数:\(params.params)")
//            hud?.hide(animated: true)
//            if response.error != nil {
//               LogError("\(response.error!)")
//               alert(msg: response.error!.localizedDescription)
//               ob.onError(response.error!)
//            }else if let data = response.data,let jsonString = String(data: data, encoding: String.Encoding.utf8){
//               if let next = T.deserialize(from: jsonString){
//                  LogInfo("返回数据:\(next.toJSON())")
//                  ob.onNext(next)
//               }else{
//                  alert(msg: "数据解析失败")
//                  ob.onError(NetRequestError.Other)
//               }
//            }else{
//               alert(msg: "解析失败")
//               ob.onError(NetRequestError.Other)
//            }
//            ob.onCompleted()
//         }
//         return Disposables.create{}
//      }
//   }

    class func requestData(params: ParamsAppender, method: HTTPMethod, encoding: ParameterEncoding? = nil, progress: Bool = true) -> Observable<Data>{
        return Observable<Data>.create{ ob in
            var hud: MBProgressHUD?