From cd6fef7e7cf3fceeecc3bc8153b6f2075686c18f Mon Sep 17 00:00:00 2001
From: donghongyu-pc <donghongyu@zhidaoauto.com>
Date: Thu, 15 Aug 2024 19:02:37 +0800
Subject: [PATCH] =?UTF-8?q?[Routing]=201=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E7=82=B9=E7=9A=84=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E8=BF=90=E8=90=A5=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=9B=B8=E5=BA=94=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt   | 9 ++-------
 .../och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt     | 8 +++++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt
index e13446132e..5b3e655399 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiRoutingBean.kt
@@ -14,13 +14,7 @@ data class GrayLineBean(
     var lineFailCount: Int?, //线路累计反馈不可用次数
     var isChoosed: Boolean = false, //当前是否选中
     var startSite: RoutingSite?,
-    var endSite: RoutingSite?,
-    var hdMapDBVersionCode: String?,// Routing 运营平台通过算路引擎算这条路时候使用的对应高精地图版本号
-    var hdMapDBVersionName: String?,// Routing 运营平台通过算路引擎算这条路时候使用的对应高精地图版本名
-    var routingEnginVersionCode: String?,// Routing 运营平台当前的算路引擎版本号码
-    var routingEnginVersionName: String?,// Routing 运营平台当前的算路引擎版本名称
-    var wayPoints: MutableList<RoutingSite>?,// Routing 给算路引擎使用的经停点列表，不是真正的要停车
-    var blackPoints: MutableList<RoutingSite>?// Routing 给算路引擎使用的黑名单点，目的是不参与算路
+    var endSite: RoutingSite?
 )
 
 /**
@@ -54,6 +48,7 @@ data class ContrailBean(
     var contrailSaveTimeDPQP: Long = -1L,
     var version: Long = -1L,
     var passPoints: MutableList<RoutingSite>?, //  用于算路的经停点
+    var blackPoints: MutableList<RoutingSite>?, //  用于算路的黑名單點
 )
 
 /**
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt
index e5acf99936..6957b952c0 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/TaxiRoutingModel.kt
@@ -586,6 +586,7 @@ object TaxiRoutingModel {
         val wayLatLons: MutableList<AutopilotControlParameters.AutoPilotLonLat> = ArrayList()
         val blackLatLons: MutableList<AutopilotControlParameters.AutoPilotLonLat> = ArrayList()
 
+        // 途经点
         if (!contrailBean.passPoints.isNullOrEmpty()) {
             for (mogoLatLng in contrailBean.passPoints!!) {
                 wayLatLons.add(
@@ -597,9 +598,10 @@ object TaxiRoutingModel {
             }
         }
 
-        if (!grayLineBean.blackPoints.isNullOrEmpty()) {
-            for (mogoLatLng in grayLineBean.blackPoints!!) {
-                wayLatLons.add(
+        // 黑名单点
+        if (!contrailBean.blackPoints.isNullOrEmpty()) {
+            for (mogoLatLng in contrailBean.blackPoints!!) {
+                blackLatLons.add(
                     AutopilotControlParameters.AutoPilotLonLat(
                         mogoLatLng.wgs84Lat,
                         mogoLatLng.wgs84Lon