From 2d9fe724c3257b906c864ee385500d2df1fb35cc Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 18 Oct 2024 13:59:09 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E6=B7=BB=E5=8A=A0=E6=A0=87?=
 =?UTF-8?q?=E5=AE=9A=E5=9B=BE=E7=89=87]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itinerarycurrent/ItineraryCurrentView.kt     |   5 ++++-
 .../res/drawable-nodpi/taxi_task_calibration.png | Bin 0 -> 2432 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100755 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_calibration.png

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
index ea4803aa2c..173719a152 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
@@ -275,7 +275,8 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
         taskStatus.text = resources.getString(R.string.task_start_to_virtual_site)
         startStationName.text = resources.getString(R.string.task_current_loc)
         endStationName.text = driveToNearestStationTask.siteName
-
+        aciv_task_type_exercise.setImageResource(R.drawable.taxi_task_calibration)
+        naviToStart.visibility = GONE
         setOrRemoveMapMaker(
             true,
             TAXI_END_MAP_MAKER,
@@ -638,6 +639,8 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
 
         taskStatus.text = resources.getString(R.string.task_start_end_site)
 
+        aciv_task_type_exercise.setImageResource(R.drawable.taxi_task_exercise)
+
 
         startStationName.text = startSite.siteName
         endStationName.text = endSite.siteName
diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_calibration.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_task_calibration.png
new file mode 100755
index 0000000000000000000000000000000000000000..5a15f4d7fdc376f121d50ca9aefdd9a86f98d488
GIT binary patch
literal 2432
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

literal 0
HcmV?d00001