yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v6.2.6]SaaSTaxi司机：增加"算路"轨迹标识

Browse Source
This commit is contained in:
pangfan
2023-12-20 11:51:47 +08:00
parent 7df2be58cb
commit 5a2b7c5866
5 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt
View File

@@ -255,6 +255,7 @@ data class TrajectoryListRespBean(var data: MutableList<Result>?) : BaseData() {
data class Result(
var lineId: Long,
var lineName: String,
var source: Int, //轨迹来源：1 录制；2 自主计算
var csvFileUrl: String,
var csvFileMd5: String,
var txtFileUrl: String,

7
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
View File

@@ -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 -> { //无

3
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt
View File

@@ -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)

BIN
OCH/taxi/unmanned-driver/src/main/res/drawable-xhdpi/taxi_driver_trajectory_type_auto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

11
OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml
View File

@@ -139,8 +139,9 @@
<com.mogo.och.common.module.wigets.MarqueeTextView
android:id="@+id/endStationName"
android:layout_width="@dimen/dp_366"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/dp_366"
android:layout_marginTop="@dimen/dp_12"
app:layout_constraintLeft_toLeftOf="@+id/startStationTag"
app:layout_constraintTop_toBottomOf="@+id/endStationTag"
@@ -151,6 +152,14 @@
android:textSize="@dimen/dp_44"
android:text="终点站"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/trajectoryType"
android:layout_width="@dimen/dp_23"
android:layout_height="@dimen/dp_23"
app:layout_constraintLeft_toRightOf="@id/endStationName"
app:layout_constraintTop_toTopOf="@id/endStationName"
android:src="@drawable/taxi_driver_trajectory_type_auto"
android:visibility="gone"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/startPoint"