diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java index fe2a0d2b59..86ef45ca09 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java @@ -8,13 +8,12 @@ public class TaxiPassengerStartReqBean { public String orderNo; public String sn; - public Double gcjLat; - public Double gcjLon; - public TaxiPassengerStartReqBean(String sn, String orderNo, Double gcjLat, Double gcjLon) { + public Long lineId; + + public TaxiPassengerStartReqBean(String sn, String orderNo, Long lineId) { this.sn = sn; this.orderNo = orderNo; - this.gcjLat = gcjLat; - this.gcjLon = gcjLon; + this.lineId = lineId; } } diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index 541df1a3d7..d719e36932 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt @@ -188,11 +188,10 @@ object AutopilotManager : IMoGoAutopilotStatusListener { */ private fun startAutoPilotServiceByPassenger() { if (TaxiPassengerModel.currentOCHOrder == null) return - val currentLocation = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() + //val currentLocation = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02() TaxiPassengerServiceManager.startAutoPilotServiceByPassenger( TaxiPassengerModel.currentOCHOrder!!.orderNo, - currentLocation.latitude, - currentLocation.longitude, + TaxiPassengerModel.currentLineId, object : OchCommonServiceCallback { override fun onSuccess(data: TaxiPassengerBaseRespBean) { VoiceNotice.showNotice("坐稳扶好,我们出发咯!", AIAssist.LEVEL2) diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt index 2b4764eca9..1dae935590 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt @@ -81,7 +81,7 @@ internal interface TaxiPassengerServiceApi { * @return */ @Headers("Content-type:application/json;charset=UTF-8") - @POST("/och-taxi-cabin/api/flow/v1/startService") + @POST("/och-taxi-cabin/api/flow/v1/startTask") fun startAutoPilotServiceByPassenger( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String= MoGoAiCloudClientConfig.getInstance().token, diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt index bad03776c5..c2b640385f 100644 --- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt +++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt @@ -110,15 +110,14 @@ object TaxiPassengerServiceManager { @JvmStatic fun startAutoPilotServiceByPassenger( orderNo: String?, - gcjLat: Double?, - gcjLon: Double?, + lineId: Long?, callback: OchCommonServiceCallback? ) { if (beforeNet()) { return } mOCHTaxiServiceApi.startAutoPilotServiceByPassenger( - data = TaxiPassengerStartReqBean(driverSn, orderNo, gcjLat, gcjLon) + data = TaxiPassengerStartReqBean(driverSn, orderNo, lineId) ) .transformTry() .retry(3)