From 4c5da7b3e7eac1427732588dcec84571c9794d15 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Sun, 14 May 2023 21:51:38 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20m1=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E8=B7=AF=E7=BA=BF=E5=88=87=E6=8D=A2=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8D=E5=86=8D=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/magic/mogo/och/charter/model/DriverM1Model.kt    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 d72a9a072e..b3be7d3a25 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
@@ -228,7 +228,6 @@ class DriverM1Model {
                         if (msg.type == DPMsgType.TYPE_CHANGE_DEST.type){
                             val changeDestMsg = GsonUtils.fromJson(String(byteArray),
                                 ChangeDestMsg::class.java) as ChangeDestMsg
-                            currentChangeDestMsg = changeDestMsg
                             if (changeDestMsg.arriveStatus == 2){//到站
                                 // 2、到站同步
                                 sendMsgToClient(changeDestMsg)
@@ -249,6 +248,14 @@ class DriverM1Model {
 
     private fun showChangerDestCommitDialog(changeDestMsg: ChangeDestMsg) {
         if (!TextUtils.isEmpty(changeDestMsg.destSiteName) && !TextUtils.isEmpty(changeDestMsg.lineName)){
+            if (changeDestMsg.lineId == currentChangeDestMsg?.lineId){//同一条路线切换站点不需要再确认
+                currentChangeDestMsg = changeDestMsg
+                changeDest()
+                return
+            }
+
+            currentChangeDestMsg = changeDestMsg
+
             UiThreadHandler.post{
                 mChangeDestCallback?.showCommitDialog("确认路线站点",
                     "请确认是否前往 "+ changeDestMsg.lineName+ changeDestMsg.destSiteName + " 站点")