From 1791fd28f29c658fc4bb7364262854597cddceaa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 6 Nov 2024 18:20:24 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.4]=20[fix]=20[=E6=A0=B8=E9=94=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=B1=E8=B4=A5=E5=A4=84=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/callback/ITaxiCarServiceCallback.kt | 1 + .../taxi/ui/task/TaxiCurrentTaskViewModel.kt | 4 ++++ .../och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 2 ++ .../itinerarycurrent/ItineraryCurrentModel.kt | 17 ++++++++++++----- .../itinerarycurrent/ItineraryCurrentView.kt | 7 +++++-- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/callback/ITaxiCarServiceCallback.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/callback/ITaxiCarServiceCallback.kt index 708d9bb030..79b047ac66 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/callback/ITaxiCarServiceCallback.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/callback/ITaxiCarServiceCallback.kt @@ -18,4 +18,5 @@ interface ITaxiCarServiceCallback { fun onCarStartServiceFailed(code: Int, msg: String) fun onCarStartServiceError() + fun onStartTaskFail() } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt index edcfce921e..b01476393a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -462,6 +462,10 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), } } + override fun onStartTaskFail() { + + } + private fun clearDemoModeAndACParameters(){ if (FunctionBuildConfig.isDemoMode) { d(TAG, "setIPCDemoMode：false") 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 fc0bc0cee0..77f79bbfd9 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 @@ -947,6 +947,7 @@ object TaxiTaskModel { override fun onError() { super.onError() + mTaxiCarServiceCallback?.onStartTaskFail() if (!NetworkUtils.isConnected(mContext)) { // 网络异常,接口重试 ToastUtils.showShort("网络出现异常,请稍后重试") DebugView.printErrorMsg("[开始任务] 网络出现异常,请稍后重试") @@ -957,6 +958,7 @@ object TaxiTaskModel { } override fun onFail(code: Int, msg: String?) { + mTaxiCarServiceCallback?.onStartTaskFail() DebugView.printErrorMsg("[开始任务] 请求fail, code=$code, msg=$msg, lindId=$lineId") d(TAG, "startTask onFail: code=$code, msg=$msg") ToastUtils.showShort("开始任务请求出现异常,请稍后重试,code=$code, msg=$msg, lindId=$lineId") 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 b843c773be..34202a630c 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 @@ -1,6 +1,5 @@ -package com.mogo.och.unmanned.taxi.ui.itinerarycurrent +package com.mogo.och.unmanned.taxi.ui.task.itinerarycurrent -import androidx.lifecycle.ViewModel import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.status.MogoStatusManager import com.mogo.eagle.core.data.BaseData @@ -27,7 +26,6 @@ import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.base.BaseViewModel import com.mogo.och.unmanned.taxi.base.IUiIntent import com.mogo.och.unmanned.taxi.bean.QueryCurrentTaskRespBean -import com.mogo.och.unmanned.taxi.bean.StartGrayAndQueryContrailRsp import com.mogo.och.unmanned.taxi.bean.StartServiceRespBean import com.mogo.och.unmanned.taxi.bean.TrajectoryListRespBean import com.mogo.och.unmanned.taxi.callback.ITaxiCarServiceCallback @@ -179,9 +177,14 @@ class ItineraryCurrentModel : BaseViewModel(), private fun startTask(isStartAutopilot: Boolean = true) { if (!TaxiTaskModel.checkCurrentTaskCondition()) { ToastUtils.showShort("无任务！") + onStartTaskFail() + return + } + if(TaxiTaskModel.getCurrentTaskWithOrder()==null){ + ToastUtils.showShort("无任务！") + onStartTaskFail() return } - TaxiTaskModel.getCurrentTaskWithOrder()?.let { TaxiTaskModel.startTask( if (it.order != null && it.order!!.orderStatus >= TaxiOrderStatusEnum.ArriveAtStart.code) @@ -480,6 +483,10 @@ class ItineraryCurrentModel : BaseViewModel(), } } + override fun onStartTaskFail() { + viewCallback?.onStartTaskFail() + } + private fun clearDemoModeAndACParameters(){ if (FunctionBuildConfig.isDemoMode) { d(TAG, "setIPCDemoMode：false") @@ -505,7 +512,7 @@ class ItineraryCurrentModel : BaseViewModel(), interface SwtichLineViewCallback { - + fun onStartTaskFail() } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt index 6a53c25dc4..147d856dc6 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt @@ -32,7 +32,6 @@ import com.mogo.och.common.module.utils.FlowBus import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.common.module.wigets.CommonSlideView -import com.mogo.och.common.module.wigets.OCHCommitDialog import com.mogo.och.common.module.wigets.dialog.CommonDialogStatus import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider @@ -46,7 +45,6 @@ import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_ import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER import com.mogo.och.unmanned.taxi.ui.debug.DebugView -import com.mogo.och.unmanned.taxi.ui.itinerarycurrent.ItineraryCurrentModel import com.mogo.och.unmanned.taxi.ui.task.TaskUiIntent import com.mogo.och.unmanned.taxi.ui.task.TaskWithOrderUIState import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel @@ -868,4 +866,9 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi } } + override fun onStartTaskFail() { + commonSlideViewStartServer.reset() + } + + }