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

[6.0.0] 处理运营单完成, 暂停接单, 倒计时不消失问题

Browse Source
This commit is contained in:
wangmingjun
2023-09-05 12:08:49 +08:00
parent 3907b5c916
commit 1ea966db58
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
prepareTaskCountdownTv.visibility = View.VISIBLE
mPrepareTasCountDownTimer = object : CountDownTimer(TIMER_PREPARE_TASK_INTERVAL_120S, 1000L) {// 5倒计时后开启自驾
@SuppressLint("SetTextI18n")
override fun onTick(millisUntilFinished: Long) {
// 倒计时
UiThreadHandler.post {
@@ -413,23 +412,23 @@ class TaxiCurrentTaskFragment : BaseFragment(),
}
private fun updateMapMarkers(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
if (taskAndOrder != null && taskAndOrder!!.startSite != null
&& taskAndOrder!!.endSite != null
if (taskAndOrder?.startSite != null
&& taskAndOrder.endSite != null
) {
when (taskAndOrder.currentStatus) {
TaskStatusEnum.GetTask.code -> {
setOrRemoveMapMaker(
true,
TAXI_START_MAP_MAKER,
taskAndOrder!!.startSite!!.wgs84Lat,
taskAndOrder!!.startSite!!.wgs84Lon,
taskAndOrder.startSite!!.wgs84Lat,
taskAndOrder.startSite!!.wgs84Lon,
R.raw.star_marker
)
setOrRemoveMapMaker(
true,
TAXI_END_MAP_MAKER,
taskAndOrder!!.endSite!!.wgs84Lat,
taskAndOrder!!.endSite!!.wgs84Lon,
taskAndOrder.endSite!!.wgs84Lat,
taskAndOrder.endSite!!.wgs84Lon,
R.raw.end_marker
)
}
@@ -438,15 +437,15 @@ class TaxiCurrentTaskFragment : BaseFragment(),
setOrRemoveMapMaker(
false,
TAXI_START_MAP_MAKER,
taskAndOrder!!.startSite!!.wgs84Lat,
taskAndOrder!!.startSite!!.wgs84Lon,
taskAndOrder.startSite!!.wgs84Lat,
taskAndOrder.startSite!!.wgs84Lon,
R.raw.star_marker
)
setOrRemoveMapMaker(
true,
TAXI_END_MAP_MAKER,
taskAndOrder!!.endSite!!.wgs84Lat,
taskAndOrder!!.endSite!!.wgs84Lon,
taskAndOrder.endSite!!.wgs84Lat,
taskAndOrder.endSite!!.wgs84Lon,
R.raw.end_marker
)
}
@@ -455,15 +454,15 @@ class TaxiCurrentTaskFragment : BaseFragment(),
setOrRemoveMapMaker(
false,
TAXI_START_MAP_MAKER,
taskAndOrder!!.startSite!!.wgs84Lat,
taskAndOrder!!.startSite!!.wgs84Lon,
taskAndOrder.startSite!!.wgs84Lat,
taskAndOrder.startSite!!.wgs84Lon,
R.raw.star_marker
)
setOrRemoveMapMaker(
false,
TAXI_END_MAP_MAKER,
taskAndOrder!!.endSite!!.wgs84Lat,
taskAndOrder!!.endSite!!.wgs84Lon,
taskAndOrder.endSite!!.wgs84Lat,
taskAndOrder.endSite!!.wgs84Lon,
R.raw.end_marker
)
}

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

@@ -271,15 +271,11 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
&& currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
) {
VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦")
return
} else {
VoiceNotice.showNotice("暂停接单啦")
}
// TODO 如果当前有订单就不要刷新
if (currentTaskWithOrder?.startSite != null &&
currentTaskWithOrder.endSite != null
) {
return
}
updateDriveToNearestStationTaskUI(driveToNearestStationTask)
}