From 9938fb149b2da2d2d14aa1a40362b699eb76c9ba Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Wed, 20 Dec 2023 20:55:36 +0800
Subject: [PATCH] =?UTF-8?q?[v6.2.6]SaaSTaxi=E5=8F=B8=E6=9C=BA=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0"=E7=AE=97=E8=B7=AF"=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86(2=E6=AC=A1=E4=BC=98=E5=8C=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/ui/task/TaxiCurrentTaskFragment.kt  | 16 ++++++++++------
 .../och/taxi/ui/task/TaxiNextTaskFragment.kt     |  3 ---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
index 69f3b0b666..68b322045c 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
@@ -261,8 +261,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
         taskStatus.text = resources.getString(R.string.task_start_to_virtual_site)
         startStationName.text = resources.getString(R.string.task_current_loc)
         endStationName.text = driveToNearestStationTask.siteName
-        trajectoryType.visibility = if (TaxiTaskModel.getCurrentTaskTrajectory()?.source == 2)
-            View.VISIBLE else View.GONE
         updateStartAndEndStationPointByStatus(true)
 
         setOrRemoveMapMaker(
@@ -494,8 +492,11 @@ class TaxiCurrentTaskFragment : BaseFragment(),
         taskTypeTv.text = resources.getString(R.string.task_exercise)
         startStationName.text = startSite.siteName
         endStationName.text = endSite.siteName
-        trajectoryType.visibility = if (TaxiTaskModel.getCurrentTaskTrajectory()?.source == 2)
-            View.VISIBLE else View.GONE
+        TaxiTaskModel.getCurrentOrderTrajectoryList().also {
+            val taskTrajectory = it.firstOrNull {taskAndOrder.lineId == it.lineId}
+            trajectoryType.visibility = if (taskTrajectory?.source == 2)
+                View.VISIBLE else View.GONE
+        }
         updatePrepareTaskDelayUI(0, false)
         updateStartAndEndStationPointByStatus(true)
     }
@@ -531,8 +532,11 @@ class TaxiCurrentTaskFragment : BaseFragment(),
         )
         startStationName.text = order.orderStartSite?.siteName
         endStationName.text = order.orderEndSite?.siteName
-        trajectoryType.visibility = if (TaxiTaskModel.getCurrentTaskTrajectory()?.source == 2)
-            View.VISIBLE else View.GONE
+        TaxiTaskModel.getCurrentOrderTrajectoryList().also {
+            val orderTrajectory = it.firstOrNull {order.orderLine == it.lineId}
+            trajectoryType.visibility = if (orderTrajectory?.source == 2)
+                View.VISIBLE else View.GONE
+        }
 
         when (order.orderStatus) {
             TaxiOrderStatusEnum.None.code -> { //无
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt
index cc0a053ef2..1951dbf795 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt
@@ -26,7 +26,6 @@ import kotlinx.android.synthetic.main.task_fragment_current.startStationName
 import kotlinx.android.synthetic.main.task_fragment_current.taskClickBtn
 import kotlinx.android.synthetic.main.task_fragment_current.taskOtherInfo
 import kotlinx.android.synthetic.main.task_fragment_current.taskTypeTv
-import kotlinx.android.synthetic.main.task_fragment_current.trajectoryType
 
 /**
  * @author: wangmingjun
@@ -99,8 +98,6 @@ class TaxiNextTaskFragment : BaseFragment() {
         }
         order.orderEndSite?.let {
             endStationName.text = it.siteName
-            trajectoryType.visibility = if (TaxiTaskModel.getCurrentTaskTrajectory()?.source == 2)
-                View.VISIBLE else View.GONE
         }
 
         taskTypeTv.text = resources.getString(R.string.task_order)