From b5f42f0ce309b68a1e33ba7b30167b10be7450c0 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 9 Jan 2025 11:55:26 +0800 Subject: [PATCH] =?UTF-8?q?[6.9.0]=20[fix]=20[taxi]=20[=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A0=87=E5=AE=9A=E7=82=B9=20=E4=B8=8D=E5=87=BA=E8=AF=AD?= =?UTF-8?q?=E8=A8=80]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 7 +++++-- .../taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt | 1 - .../unmanned/taxi/ui/task/siteswitch/SwtichSiteModel.kt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index e0991e07dc..98fb9688a2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -1194,7 +1194,7 @@ object TaxiTaskModel { return } } - setCalibrationSite(data.data) + setCalibrationSite(data.data,true) } override fun onFail(code: Int, msg: String) { @@ -1209,7 +1209,10 @@ object TaxiTaskModel { }) } - fun setCalibrationSite(data: StartServiceRespBean.Result?) { + fun setCalibrationSite(data: StartServiceRespBean.Result?, showVoice: Boolean) { + if(showVoice) { + VoiceNotice.showNotice("开始接单啦") + } BizLoopManager.runInMainThread{ mDriveToNearestStationTask = data mLastArrivedSiteId = -1L //开始标定站点任务时, 到达站点标志位需复位 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 9f96574d95..a87c412a73 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 @@ -466,7 +466,6 @@ class ItineraryCurrentModel : BaseViewModel(), driveToNearestStationTask: StartServiceRespBean.Result?, currentTaskWithOrder: QueryCurrentTaskRespBean.Result? ) { - VoiceNotice.showNotice("开始接单啦") updateDriveToNearestStationTaskUI(driveToNearestStationTask) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/siteswitch/SwtichSiteModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/siteswitch/SwtichSiteModel.kt index 921428cf87..8c76048e68 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/siteswitch/SwtichSiteModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/siteswitch/SwtichSiteModel.kt @@ -73,7 +73,7 @@ class SwtichSiteModel : ViewModel() { } fun selectNewSite(checkStationBean: StartStationBean) { - TaxiTaskModel.setCalibrationSite( checkStationBean.toResult()) + TaxiTaskModel.setCalibrationSite(checkStationBean.toResult(), false) this.viewCallback?.showCalibrationSite() }