From 0181a5c344b4b726d48b88b13daecdd5d443ddae Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 4 Sep 2023 16:15:56 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E7=82=B9=E5=87=BB=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E6=8C=89=E9=92=AE=E6=97=B6,=20=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E8=BF=98=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B,=E5=85=88=E5=BC=80=E5=A7=8B=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=86=8D=E5=BC=80=E5=90=AF=E8=87=AA=E5=8A=A8=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/task/TaxiTaskModel.kt    | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index 13249cd386..395920467e 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -204,7 +204,7 @@ object TaxiTaskModel {
     private fun initListeners() {
         // 2021.11.1重构自动驾驶 实现接口 IMoGoAutopilotStatusListener 注册监听 替换IMogoAdasOCHCallback接口
         CallerAutoPilotStatusListenerManager.addListener(TAG, mMogoAutopilotStatusListener)
-        //定位监听， 传false是高德坐标系
+        //定位监听， 传false是高德坐标系 10 -> 100ms一次
         CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 10, mMapLocationListener)
         //2021.11.1 自动驾驶路线规划接口
         CallerPlanningRottingListenerManager.addListener(TAG, mMogoAutopilotPlanningListener)
@@ -592,9 +592,19 @@ object TaxiTaskModel {
                     }
                 }
 
+                override fun onError() {
+                    super.onError()
+                    if (!NetworkUtils.isConnected(mContext)){ // 网络异常,接口重试
+                        ToastUtils.showShort("网络出现异常,请稍后重试")
+                    }else{
+                        ToastUtils.showShort("到站接口请求出现异常,请稍后重试")
+                    }
+                }
+
                 override fun onFail(code: Int, msg: String?) {
                     DebugView.printErrorMsg("[上报ArriveSite] failed, code=$code, msg=$msg")
                     d(TAG, "code=$code msg=$msg")
+                    ToastUtils.showShort("到站接口请求出现异常,请稍后重试,code=$code msg=$msg")
                 }
             })
     }
@@ -870,9 +880,19 @@ object TaxiTaskModel {
                     d(TAG, "startTask onSuccess: data=${GsonUtil.jsonFromObject(data)}")
                 }
 
+                override fun onError() {
+                    super.onError()
+                    if (!NetworkUtils.isConnected(mContext)){ // 网络异常,接口重试
+                        ToastUtils.showShort("网络出现异常,请稍后重试")
+                    }else{
+                        ToastUtils.showShort("开始任务请求出现异常,请稍后重试")
+                    }
+                }
+
                 override fun onFail(code: Int, msg: String?) {
                     DebugView.printErrorMsg("[开始任务] 请求fail, code=$code, msg=$msg")
                     d(TAG, "startTask onFail: code=$code, msg=$msg")
+                    ToastUtils.showShort("开始任务请求出现异常,请稍后重试,code=$code, msg=$msg")
                 }
             })
     }
@@ -1097,6 +1117,13 @@ object TaxiTaskModel {
             return
         }
 
+        //在订单状态还没流转成功时, 点击了开启自驾按钮, 先去做状态流转成功再启动自驾
+        if (mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.GetTask.code){
+            DebugView.printInfoMsg("[启自驾] startTask ${mCurrentTaskWithOrder!!.lineId}")
+            startTask(mCurrentTaskWithOrder!!.lineId)
+            return
+        }
+
         //点击开始自动驾驶按钮订单状态去流转， 不再与自动驾驶是否启动成功挂钩
         isRestartAutopilot = mCurrentTaskWithOrder!!.currentStatus != TaskStatusEnum.StartTask.code