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-06 13:30:37 +08:00
committed by zhongchao
parent edd9479bcf
commit fedaf73727
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,9 +355,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
handleOrderView(order)
updateOrderUI(order)
if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已为您接到订单")
}
}
}
@@ -379,9 +376,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
updateOrderUI(order)
if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已为您接到订单")
}
return
}
if (startSite == null || endSite == null) return
@@ -401,11 +395,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
updatePathwayPoint(taskType,endSite?.siteName)
handleOrderView(it)
updateOrderUI(it)
if (taskType == TaskTypeEnum.ToOrderStartTask.code
&& currentStatus == TaskStatusEnum.CompleteTask.code
&& order.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已到达上车地点，等待乘客上车")
}
}
}
}

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

@@ -268,7 +268,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
currentTaskWithOrder: QueryCurrentTaskRespBean.Result?
) {
if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null
&& currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
&& (currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
||currentTaskWithOrder.order != null)
) {
VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦")
return

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

@@ -701,8 +701,20 @@ object TaxiTaskModel {
|| !mCurrentTaskWithOrder!!.equals(result)
) {
d(TAG, "queryCurrentTaskOnce: 更新本地数据")
mCurrentTaskWithOrder = result
if (result.order != null && result.currentStatus == TaskStatusEnum.CompleteTask.code
&& result.servingStatus == 1){
if (result.order!!.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code) {
VoiceNotice.showNotice("已为您接到订单")
}
if (result.taskType == TaskTypeEnum.ToOrderStartTask.code
&& result.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
VoiceNotice.showNotice("已到达上车地点，等待乘客上车")
}
}
// 任务为空
if (result.endSite == null && result.order == null) {
d(TAG, "queryCurrentTaskOnce: 任务为空")