From e751ea237d59b8aedd6da71b8b8db630d4fd7109 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Thu, 21 Nov 2024 17:05:33 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=201=E3=80=81Routing=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E7=82=B9=E7=9A=84=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E3=80=82=202=E3=80=81sendTrajectoryDownloadReq=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A=203=E3=80=81=E5=A2=9E=E5=8A=A0TODO?= =?UTF-8?q?=20=E9=9C=80=E8=A6=81=20=E4=BA=9A=E5=9D=A4=E8=A1=A5=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/magic/mogo/och/charter/model/DriverM1Model.kt | 5 +++++ .../charter/passenger/model/CharterPassengerModel.kt | 5 +++++ .../main/java/com/mogo/och/taxi/model/TaxiModel.java | 5 +++++ .../mogo/och/taxi/passenger/model/AutopilotManager.kt | 5 +++++ .../mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 5 +++++ .../och/unmanned/passenger/model/AutopilotManager.kt | 5 +++++ .../core/data/autopilot/AutopilotControlParameters.kt | 11 ++++++++++- .../api/autopilot/IMoGoAutopilotControlProvider.kt | 3 +++ .../call/autopilot/CallerAutoPilotControlManager.kt | 3 ++- 9 files changed, 45 insertions(+), 2 deletions(-) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index 01ddc11818..73e78b070b 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -597,6 +597,11 @@ class DriverM1Model { parameters.endLatLon = AutopilotControlParameters.AutoPilotLonLat(mCurrentOrder?.wgs84Lat!!, mCurrentOrder?.wgs84Lon!!) parameters.vehicleType = VEHICLE_TYPE + + // TODO 这里需要增加传入 白名单点列表、黑名单点列表，顺序按照服务端传入顺序为准。 + //parameters.wayLatLons + //parameters.blackLatLons + if (parameters.autoPilotLine == null) { parameters.autoPilotLine = AutopilotControlParameters.AutoPilotLine( mCurrentOrder!!.lineId.toLong(), mCurrentOrder!!.lineName, diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index 45132b76a3..86b0c073f0 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -1190,6 +1190,11 @@ object CharterPassengerModel { parameters.endName = PinYinUtil.getPinYinHeadChar(orderInfo.siteName) parameters.startLatLon = AutoPilotLonLat(startWgsLat, startWgsLon) parameters.endLatLon = AutoPilotLonLat(endWgsLat, endWgsLon) + + // TODO 这里需要增加传入 白名单点列表、黑名单点列表，顺序按照服务端传入顺序为准。 + //parameters.wayLatLons + //parameters.blackLatLons + locusInfo?.let { locus -> if (parameters.autoPilotLine == null) { parameters.autoPilotLine = AutoPilotLine( diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index ce06a4d692..a6b9bbf141 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1013,6 +1013,11 @@ public class TaxiModel { parameters.endName = PinYinUtil.getPinYinHeadChar(mCurrentOCHOrder.endSiteAddr); // 终点名称拼音首字母大写：科学城C区三号门（KXCCQSHM） parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon); parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon); + + // TODO 这里需要增加传入 白名单点列表、黑名单点列表，顺序按照服务端传入顺序为准。 + //parameters.wayLatLons + //parameters.blackLatLons + if (parameters.autoPilotLine == null) { parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine( mCurrentOCHOrder.lineId, mCurrentOCHOrder.lineName, diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index 63d4d50ac6..a4c70233e1 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt @@ -161,6 +161,11 @@ object AutopilotManager : IOchAutopilotStatusListener { parameters.startLatLon = AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon) parameters.endLatLon = AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon) + + // TODO 这里需要增加传入 白名单点列表、黑名单点列表，顺序按照服务端传入顺序为准。 + //parameters.wayLatLons + //parameters.blackLatLons + if (parameters.autoPilotLine == null) { parameters.autoPilotLine = AutopilotControlParameters.AutoPilotLine( TaxiPassengerModel.currentOCHOrder!!.lineId, diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index eb40d5102b..12800e9511 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -1288,6 +1288,11 @@ object TaxiTaskModel { parameters.startLatLon = AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon) parameters.endLatLon = AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon) + + // TODO 这里需要增加传入 白名单点列表、黑名单点列表，顺序按照服务端传入顺序为准。 + //parameters.wayLatLons + //parameters.blackLatLons + if (parameters.autoPilotLine == null) { parameters.autoPilotLine = AutopilotControlParameters.AutoPilotLine( mCurrentTaskTrajectory!!.lineId, diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt index b057c3d6c2..9e1ba3b797 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt @@ -153,6 +153,11 @@ object AutopilotManager : IOchAutopilotStatusListener { parameters.startLatLon = AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon) parameters.endLatLon = AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon) + + // TODO 这里需要增加传入 白名单点列表、黑名单点列表，顺序按照服务端传入顺序为准。 + //parameters.wayLatLons + //parameters.blackLatLons + if (parameters.autoPilotLine == null) { if (TaxiPassengerModel.currentLineId != null && TaxiPassengerModel.currentTrajectoryInfo != null diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt index 4272ab7dd5..321eb2de06 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt @@ -43,12 +43,20 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo { endLoc.latitude = it.lat endLoc.longitude = it.lon } + // Routing算路白名单点赋值 this.wayLatLons?.forEach { val locBuilder = MessagePad.Location.newBuilder() locBuilder.latitude = it.lat locBuilder.longitude = it.lon routeInfo.addWayPoints(locBuilder.build()) } + // Routing算路黑名单点赋值 + this.blackLatLons?.forEach { + val locBuilder = MessagePad.Location.newBuilder() + locBuilder.latitude = it.lat + locBuilder.longitude = it.lon + routeInfo.addBlackPoints(locBuilder.build()) + } if (this.routeID > 0) { routeInfo.routeID = this.routeID } @@ -61,7 +69,7 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo { routeInfo.startLocation = startLoc.build() routeInfo.endLocation = endLoc.build() - //20240523 用于表示判断是否是站点下单。默认false：起点下单，接管下单； true: 中间站点下单 + // TODO 20240523 用于表示判断是否是站点下单。默认false：起点下单，接管下单； true: 中间站点下单 //routeInfo.isStation = false val line = MessagePad.Line.newBuilder() @@ -121,6 +129,7 @@ class AutopilotControlParameters { @JvmField var startLatLon: AutoPilotLonLat? = null + // Bus 需要将中间站点填充进去（运营平台完成此步骤） @JvmField var wayLatLons: List? = null // Routing 给算路引擎使用的经停点列表，不是真正的要停车 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt index 5441e4b38c..c50de87886 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt @@ -57,6 +57,9 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider { /** * 发送 轨迹下载请求 + * + * @param autoPilotLine 线路相关参数详情见PB message_pad.proto -> Line + * @param routeInfo 20240523 进行自动算路，务必下单时候携带自动驾驶路径信息，否则可不填！ */ fun sendTrajectoryDownloadReq(autoPilotLine: AutopilotControlParameters.AutoPilotLine, routeInfo: MessagePad.RouteInfo?) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt index 87c791c4b6..169954dfbc 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt @@ -204,7 +204,7 @@ object CallerAutoPilotControlManager { } /** - * 发送 轨迹下载请求 + * 发送 轨迹下载请求。带有Routing的参数，让MAP进行离线算路。 */ fun sendTrajectoryDownloadReq(autopilotControlParameters: AutopilotControlParameters) { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { @@ -216,6 +216,7 @@ object CallerAutoPilotControlManager { /** * 发送 轨迹下载请求 + * @param autoPilotLine 启动算路参数 */ fun sendTrajectoryDownloadReq(autoPilotLine: AutopilotControlParameters.AutoPilotLine) { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {