From 0336ed238fa84ad9dfc5db1b587ee901a815716c Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 30 Dec 2024 18:36:31 +0800 Subject: [PATCH] =?UTF-8?q?[6.9.0]=20[fea]=20[taxi]=20[=E6=9C=AA=E6=8E=A5?= =?UTF-8?q?=E5=8D=95=E6=83=85=E5=86=B5=E4=B8=8B=E3=80=81=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=A0=E9=99=A4tts]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt index 1622010419..9f96574d95 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt @@ -19,6 +19,7 @@ import com.mogo.och.data.taxi.TaxiOrderStatusEnum import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.utils.ToastUtilsOch @@ -514,13 +515,16 @@ class ItineraryCurrentModel : BaseViewModel(), fun cancleTask() { DebugView.printInfoMsg("[车辆复位] 准备发送请求") + val openOrderType = LoginStatusManager.getOpenOrderType() TaxiTaskWithOrderServiceManager.resetInit( AbsMogoApplication.getApp().applicationContext, object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { DebugView.printInfoMsg("[车辆复位] 请求success") LoginStatusManager.queryLoginStatusByNet() - VoiceNotice.showNotice("暂停接单啦！"); + if(openOrderType== OpenOrderStatusEnum.Ordering) { + VoiceNotice.showNotice("暂停接单啦！"); + } TaxiTaskModel.cancelAutopilot() d(TAG, "journeyCompleted onSuccess") }