From 966fe2dae4e1e24529d5d68406315689f3600f88 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 25 May 2023 17:57:55 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20M1=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=9B=B4=E6=8D=A2=E5=A2=9E=E5=8A=A0writeVers?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/magic/mogo/och/charter/model/DriverM1Model.kt    | 9 ++++++---
 .../magic/mogo/och/charter/net/DriverM1ServiceManager.kt | 4 ++--
 .../mogo/och/charter/presenter/DriverM1Presenter.kt      | 3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
index 97414b122c..06100669c2 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -640,10 +640,11 @@ class DriverM1Model {
     /**
      * 司机端发送消息给乘客屏
      */
-    fun sendCommitMsgToClient(isConfirmed: Boolean) {
-        if (currentChangeDestMsg !== null) {
+    fun sendCommitMsgToClient(isConfirmed: Boolean,writeVersion: Long) {
+        if (currentChangeDestMsg != null) {
             d(SceneConstant.M_CHARTER_D + TAG, "confirmed station $isConfirmed" )
             currentChangeDestMsg?.isConfirmed = isConfirmed
+            currentChangeDestMsg?.writeVersion = writeVersion
             sendMsgToClient(currentChangeDestMsg)
         }
     }
@@ -804,16 +805,18 @@ class DriverM1Model {
 //            sendCommitMsgToClient(true)
 //            return
 //        }
+        val writeVersion = DateTimeUtil.getCurrentTimeStamp()
         DriverM1ServiceManager.changeDest(mContext,currentChangeDestMsg!!.lineId,
             currentChangeDestMsg!!.startSiteId,
            currentChangeDestMsg!!.destSiteId,
+            writeVersion,
            object : OchCommonServiceCallback<BaseData>{
                override fun onSuccess(data: BaseData?) {
                    if (data != null && data.code == 0){
                        d(SceneConstant.M_CHARTER_D + TAG, "confirmed station .")
                        CallerAutoPilotControlManager.cancelAutoPilot()
                        queryCurrentServiceStatus()
-                       sendCommitMsgToClient(true)
+                       sendCommitMsgToClient(true,writeVersion)
                    }
                }
 
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt
index 1f04b12b1e..dc2c462b1d 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt
@@ -67,12 +67,12 @@ object DriverM1ServiceManager {
             ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "checkOrderCountDown"))
     }
 
-    fun changeDest(context: Context?,lineId: Int,startSiteId: Int,siteId: Int,
+    fun changeDest(context: Context?,lineId: Int,startSiteId: Int,siteId: Int,writeVersion: Long,
                             callback: OchCommonServiceCallback<BaseData>?){
         mDriverM1ServiceApi.changeDest(MoGoAiCloudClientConfig.getInstance().serviceAppId,
             MoGoAiCloudClientConfig.getInstance().token,
             RequestChangeDest(MoGoAiCloudClientConfig.getInstance().sn,lineId,startSiteId,siteId,
-                             DateTimeUtil.getCurrentTimeStamp())
+                             writeVersion)
         )?.transformTry()
             ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "changeDest"))
     }
diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
index b3f8055245..2b13464cfd 100644
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.DateTimeUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean
 import com.mogo.och.common.module.biz.callback.ILoginCallback
@@ -118,7 +119,7 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
     }
 
     fun sendCommitMsgToClient(isAffirm: Boolean){
-        DriverM1Model.get().sendCommitMsgToClient(isAffirm)
+        DriverM1Model.get().sendCommitMsgToClient(isAffirm,DateTimeUtils.getCurTimeInMillis())
     }
 
     fun changeDest(){