From a007bbf1303df6579a23159a597b0a4aee9cbbb1 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.om>
Date: Fri, 24 May 2024 19:14:24 +0800
Subject: [PATCH] =?UTF-8?q?[Routing=20dev]=201=E3=80=81=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8Routing=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt    | 3 ++-
 .../och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt    | 7 ++++++-
 .../java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt  | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt
index aa5fd325a5..d0ece766dd 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiRoutingBean.kt
@@ -11,7 +11,8 @@ data class GrayLineBean(
     var lineFailCount: Int?, //线路累计反馈不可用次数
     var isChoosed: Boolean = false, //当前是否选中
     var startSite: RoutingSite?,
-    var endSite: RoutingSite?
+    var endSite: RoutingSite?,
+    var isAutoRouting: Boolean = true, //是否进行自动算路,true--使用车端自动算路，false--不使用自动算路，使用轨迹循迹
 )
 
 data class RoutingSite(
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt
index 501cc62945..807cdeafcd 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt
@@ -32,7 +32,12 @@ class TaxiRoutingChooseLineAdapter(
     override fun onBindViewHolder(holder: SwitchLineViewHolder, position: Int) {
         val currentPosition = holder.bindingAdapterPosition
         val data = mData[currentPosition]
-        holder.lineNameTextView.text = data.lineName
+        // 区分Routing和循迹
+        holder.lineNameTextView.text = if (data.isAutoRouting) {
+            "Routing-" + data.lineName
+        } else {
+            data.lineName
+        }
         holder.todayVerifyNumTextView.text = "本车今日已验证：${data.carVerificationCount}次"
         holder.historyVerifyNumTextView.text =
             "路线累计反馈${data.lineSuccessCount}可用，${data.lineFailCount}不可用"
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt
index 6db672f5ea..90cbe7943b 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingModel.kt
@@ -492,7 +492,8 @@ object TaxiRoutingModel {
             CallerLogger.e(TAG, "AutopilotControlParameters is empty.")
             return
         }
-        parameters.isAutoRouting = true
+        // 使用云端配置的Routing灰度路线
+        parameters.isAutoRouting = grayLineBean.isAutoRouting
 
         OchAutoPilotManager.startAutoPilot(parameters);