From 5a2b7c5866ef264a5d980bdef9e73da4fbd50326 Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 20 Dec 2023 11:51:47 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/bean/TaxiDriverTaskWithOrderBean.kt | 1 + .../och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 7 +++++++ .../och/taxi/ui/task/TaxiNextTaskFragment.kt | 3 +++ .../taxi_driver_trajectory_type_auto.png | Bin 0 -> 4173 bytes .../main/res/layout/task_fragment_current.xml | 11 ++++++++++- 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_driver_trajectory_type_auto.png diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt index cb3277ee99..890f662f38 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt @@ -255,6 +255,7 @@ data class TrajectoryListRespBean(var data: MutableList?) : BaseData() { data class Result( var lineId: Long, var lineName: String, + var source: Int, //轨迹来源：1 录制；2 自主计算 var csvFileUrl: String, var csvFileMd5: String, var txtFileUrl: String, 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 cb1e31f4b8..69f3b0b666 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 @@ -56,6 +56,7 @@ 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.taskStatus import kotlinx.android.synthetic.main.task_fragment_current.taskTypeTv +import kotlinx.android.synthetic.main.task_fragment_current.trajectoryType import kotlinx.android.synthetic.main.taxi_no_data_common_view.noOrderDataTv import kotlinx.android.synthetic.main.taxi_no_data_common_view.prepareTaskCountdownTv import kotlinx.coroutines.flow.map @@ -260,6 +261,8 @@ 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( @@ -491,6 +494,8 @@ 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 updatePrepareTaskDelayUI(0, false) updateStartAndEndStationPointByStatus(true) } @@ -526,6 +531,8 @@ 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 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 1951dbf795..cc0a053ef2 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,6 +26,7 @@ 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 @@ -98,6 +99,8 @@ 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) diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_driver_trajectory_type_auto.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_driver_trajectory_type_auto.png new file mode 100644 index 0000000000000000000000000000000000000000..785e502f66bbc64b3f53b2c6d97ccd2a66fe4441 GIT binary patch literal 4173 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 XU`jbw86dvA00000NkvXXu0mjf-6Os_ literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml index e0829bbb2f..782cb0a8cc 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml @@ -139,8 +139,9 @@ +