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

[Taxi无人化] fix: 演练类型订单 乘客屏页面没刷新问题；

Browse Source
This commit is contained in:
aibingbing
2023-08-30 16:20:32 +08:00
committed by zhongchao
parent 8d77aeaaa0
commit 03003eaea9
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
View File

@@ -170,8 +170,11 @@ object TaxiPassengerModel {
"queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data"
)
// 如果上一个是 接驾或送驾任务 下一个是演练任务，需要reset页面状态
currentOCHOrder = null
orderStatusChange()
if (currentOCHOrder != null) {
currentOCHOrder?.orderStatus = TaxiPassengerOrderStatusEnum.None.code
orderStatusChange()
currentOCHOrder = null
}
return
}
if (data.data?.order == null) {
@@ -194,8 +197,8 @@ object TaxiPassengerModel {
if (currentOCHOrder?.orderStatus == TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
&& currentOrder.orderStatus < TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
) {
// 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟
// 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据
// 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟
// 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据
} else {
currentOCHOrder = currentOrder
orderStatusChange()

10
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
View File

@@ -66,6 +66,14 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
order?.let {
setItineraryVisibility()
when (TaxiPassengerModel.curOrderStatus) {
TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
// 10 接驾中
mView?.showOrHideStartAutopilotView(isShow = false)
mView?.showOrHidePressengerCheckPager(isShow = false)
mView?.showOrHideArrivedEndLayout(isShow = false)
overMapViewClear()
}
TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
// 20 司机到达上车点
mView?.showOrHideArrivedEndLayout(isShow = false)
@@ -104,6 +112,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
mView?.showOrHideArrivedEndLayout(false)
overMapViewClear()
}
TaxiPassengerOrderStatusEnum.Cancel -> {
// 70 取消订单
mView?.showOrHideStartAutopilotView(isShow = false)
@@ -111,6 +120,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
mView?.showOrHideArrivedEndLayout(isShow = false)
overMapViewClear()
}
TaxiPassengerOrderStatusEnum.None -> {
// 00 默认状态，在不同任务之间切换时使用
mView?.showOrHideStartAutopilotView(isShow = false)