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

[v6.2.6]SaaSTaxi司机：增加"算路"轨迹标识(2次优化)

Browse Source
This commit is contained in:
pangfan
2023-12-20 20:55:36 +08:00
parent 6900cb706c
commit 9938fb149b
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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