From 95f81150ba0ac3435b19868356d0642da325893f Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 17 Apr 2023 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20m1=20=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=B7=AF=E7=BA=BF=E6=94=B9=E4=B8=BA=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/charter/model/DriverM1Model.kt   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 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 8381ca7ba8..2e1f653608 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
@@ -236,15 +236,10 @@ class DriverM1Model {
         }
 
     private fun showChangerDestCommitDialog(changeDestMsg: ChangeDestMsg) {
-        if (!TextUtils.isEmpty(changeDestMsg.destSiteName)){
+        if (!TextUtils.isEmpty(changeDestMsg.destSiteName) && !TextUtils.isEmpty(changeDestMsg.lineName)){
             UiThreadHandler.post{
-                mChangeDestCallback?.showCommitDialog("确认站点",
-                    "请确认是否前往"+ changeDestMsg.destSiteName + "站点")
-            }
-        }else if (!TextUtils.isEmpty(changeDestMsg.lineName)){
-            UiThreadHandler.post{
-                mChangeDestCallback?.showCommitDialog("确认路线",
-                    "请确认是否切换"+ changeDestMsg.lineName + "路线")
+                mChangeDestCallback?.showCommitDialog("确认路线站点",
+                    "请确认是否前往 "+ changeDestMsg.lineName+ changeDestMsg.destSiteName + " 站点")
             }
         }
     }
@@ -526,6 +521,7 @@ class DriverM1Model {
      */
     fun sendCommitMsgToClient(isConfirmed: Boolean) {
         if (currentChangeDestMsg !== null) {
+            d(SceneConstant.M_CHARTER_D + TAG, "confirmed station $isConfirmed" )
             currentChangeDestMsg?.isConfirmed = isConfirmed
             sendMsgToClient(currentChangeDestMsg)
         }
@@ -674,11 +670,11 @@ class DriverM1Model {
 
     fun changeDest(){
         if (currentChangeDestMsg == null) return
-        if (TextUtils.isEmpty(currentChangeDestMsg?.destSiteName)){//确认路线
-            d(SceneConstant.M_CHARTER_D + TAG, "confirm line .")
-            sendCommitMsgToClient(true)
-            return
-        }
+//        if (TextUtils.isEmpty(currentChangeDestMsg?.destSiteName)){//确认路线
+//            d(SceneConstant.M_CHARTER_D + TAG, "confirm line .")
+//            sendCommitMsgToClient(true)
+//            return
+//        }
         DriverM1ServiceManager.changeDest(mContext,currentChangeDestMsg!!.lineId,
             currentChangeDestMsg!!.startSiteId,
            currentChangeDestMsg!!.destSiteId,