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 0000000000..785e502f66 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_driver_trajectory_type_auto.png differ 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 @@ +