From aec51d7dba8960905c0bfeb9e94689c96aeb721c Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期三, 16 八月 2023 16:40:15 +0800
Subject: [PATCH] 新版本
---
BrokerDriver/Network/Services.swift | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/BrokerDriver/Network/Services.swift b/BrokerDriver/Network/Services.swift
index b79dd44..6ae4493 100644
--- a/BrokerDriver/Network/Services.swift
+++ b/BrokerDriver/Network/Services.swift
@@ -11,12 +11,14 @@
import Alamofire
#if DEBUG
+//let All_Url = "http://192.168.110.22:8040"
let All_Url = "http://54.67.44.33:8040"
-//let All_Url = "http://54.67.44.33:8040"
let Google_Url = "https://maps.googleapis.com/maps/api"
+let Google_Url_Road = "https://roads.googleapis.com/v1"
#else
let All_Url = "http://54.67.44.33:8040"
let Google_Url = "https://maps.googleapis.com/maps/api"
+let Google_Url_Road = "https://roads.googleapis.com/v1"
#endif
@@ -178,7 +180,7 @@
.append(key: "driverId", value:UserViewModel.getUserInfo()!.id)
.append(key: "lat", value: "\(coordinate.latitude)")
.append(key: "lon", value: "\(coordinate.longitude)")
- return NetworkRequest.request(params: params, method: .post, progress: true)
+ return NetworkRequest.request(params: params, method: .get, progress: false)
}
}
@@ -209,19 +211,18 @@
.append(key: "destination", value: destination.toFormat())
.append(key: "waypoints", value: waypoints)
.append(key: "alternatives", value: false) //可供选择方案：会增加请求时间
+// .append(key: "optimize", value: true)
return NetworkRequest.requestMap(params: params.googleMapDone(), method: .get, progress: false)
}
/// When directions line was done , need call the method snap to the road.
/// - Parameter path: coordiante paths
- class func snapToRoads(path:String)->Observable<BaseResponse<SnappedPointsModel>>{
- let params = ParamsAppender.build(url: Google_Url)
+ class func snapToRoads(path:String)->Observable<SnappedPointsModel>{
+ let params = ParamsAppender.build(url: Google_Url_Road)
.interface(url: "/snapToRoads/")
.append(key: "path", value: path)
- .append(key: "interpolate", value: true)
- params.params.removeValue(forKey: "appid")
- params.params.removeValue(forKey: "language")
- return NetworkRequest.request(params: params.googleMapDone(), method: .post, progress: false)
+ .append(key: "interpolate", value: "true")
+ return NetworkRequest.requestMap(params: params.googleMapDone(has: false), method: .get, progress: false)
}
}
--
Gitblit v1.7.1