[6.7.4]

[fix]
[核销添加失败处理]

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()
 }

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

@@ -462,6 +462,10 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
         }
     }
 
+    override fun onStartTaskFail() {
+
+    }
+
     private fun clearDemoModeAndACParameters(){
         if (FunctionBuildConfig.isDemoMode) {
             d(TAG, "setIPCDemoMode：false")

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")

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<UnmannedState, TaskUiIntent>(),
     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<UnmannedState, TaskUiIntent>(),
         }
     }
 
+    override fun onStartTaskFail() {
+       viewCallback?.onStartTaskFail()
+    }
+
     private fun clearDemoModeAndACParameters(){
         if (FunctionBuildConfig.isDemoMode) {
             d(TAG, "setIPCDemoMode：false")
@@ -505,7 +512,7 @@ class ItineraryCurrentModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
 
 
     interface SwtichLineViewCallback {
-
+        fun onStartTaskFail()
     }
 }
 

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()
+    }
+
+
 }