From 65ee24fff352c22c4bd123a8eb2db436d64555d7 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 27 Sep 2023 14:09:27 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20=E6=9B=B4=E6=96=B0=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E6=A0=87=E8=AF=86=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/task/TaxiTaskModel.kt    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 753b29ef78..d6d6f7453f 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
@@ -31,7 +31,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
 import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage
@@ -119,7 +118,7 @@ object TaxiTaskModel {
 
     private var mPrepareTaskDelayRunnable: Runnable? = null
 
-    private var mIsArrivedSiteTag = false //到站标志位,防止围栏触发多次调用到站接口
+    private var mIsArrivedSiteStartTag = false //到站接口请求标志位,防止围栏触发多次调用到站接口, true 接口请求, false : 接口请求完成
 
     fun addTaskWithOrderListener(tag: String, listener: ITaxiTaskWithOrderCallback) {
         if (mTaxiTaskWithOrderCallbackMap.containsKey(tag)) {
@@ -557,12 +556,12 @@ object TaxiTaskModel {
         siteId: Long, isArriveAtEndSite: Boolean,
         isArrivedNearestStation: Boolean = false
     ) {
-        if (mIsArrivedSiteTag) {
+        if (mIsArrivedSiteStartTag) {
             DebugView.printInfoMsg("arriveSite接口正在调用中")
-            i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteTag")
+            i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteStartTag")
             return
         }
-        mIsArrivedSiteTag = true
+        mIsArrivedSiteStartTag = true
         DebugView.printInfoMsg("[上报ArriveSite] siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
         i(TAG, message = "submitArriveSite: siteId=$siteId isArriveAtEndSite=$isArriveAtEndSite")
         TaxiTaskWithOrderServiceManager.arriveSite(
@@ -570,8 +569,10 @@ object TaxiTaskModel {
             siteId,
             object : OchCommonServiceCallback<BaseData> {
                 override fun onSuccess(data: BaseData?) {
-                    mIsArrivedSiteTag = false
-                    if (data == null || data.code != 0) return
+                    if (data == null || data.code != 0) {
+                        mIsArrivedSiteStartTag = false
+                        return
+                    }
                     DebugView.printInfoMsg("[上报ArriveSite] success siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
                     d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data))
                     mDriveToNearestStationTask = null
@@ -587,7 +588,7 @@ object TaxiTaskModel {
 
                 override fun onError() {
                     super.onError()
-                    mIsArrivedSiteTag = false
+                    mIsArrivedSiteStartTag = false
                     if (!NetworkUtils.isConnected(mContext)) { // 网络异常,接口重试
                         ToastUtils.showShort("网络出现异常,请稍后重试")
                         DebugView.printErrorMsg("[上报ArriveSite] 网络出现异常,请稍后重试")
@@ -598,7 +599,7 @@ object TaxiTaskModel {
                 }
 
                 override fun onFail(code: Int, msg: String?) {
-                    mIsArrivedSiteTag = false
+                    mIsArrivedSiteStartTag = false
                     DebugView.printErrorMsg("[上报ArriveSite] failed, code=$code, msg=$msg")
                     d(TAG, "code=$code msg=$msg")
                     ToastUtils.showShort("到站接口请求出现异常,请稍后重试,code=$code msg=$msg")
@@ -718,6 +719,7 @@ object TaxiTaskModel {
                         //注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务
                         if (result.currentStatus == TaskStatusEnum.CompleteTask.code
                         ) {
+                            mIsArrivedSiteStartTag = false //任务完成说明到站, 更新到站标识位, 不再到站接口请求成功更新
                             mADASStatusCallback?.updateAutopilotStatus()
                             mTaxiTaskWithOrderCallbackMap.forEach {
                                 val listener = it.value