From 3aee93c15df2116684dfbc5c0f1d4d52b165c0bb Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 12 Apr 2023 12:50:58 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20[=E6=97=A0=E6=B3=95=E5=88=B0?=
 =?UTF-8?q?=E7=AB=99=E3=80=81=E5=88=B0=E7=AB=99=E5=90=8E=E9=9F=A9=E6=96=87?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/CharterPassengerModel.kt  | 19 +++++++++++--------
 .../mogo/och/bus/passenger/ui/MainFragment.kt |  3 +++
 .../och/bus/passenger/ui/view/LineSiteView.kt |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index 8f38ab143a..be2a5d03d1 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -848,18 +848,19 @@ object CharterPassengerModel {
     @Synchronized
     fun arriveDest() {
         orderInfo?.lineId?.let {
-            if(orderInfo!!.arriveStatus==OrderInfoResponse.ARRIVING) {
-                if (broadcastList.get("${it}$endKey")==null||broadcastList.get("${it}$endKey")==false) {
+            orderInfo?.siteId?.let { siteId ->
+                if (orderInfo!!.arriveStatus == OrderInfoResponse.ARRIVING) {
+                if (broadcastList.get("${siteId}$endKey") == null || broadcastList.get("${siteId}$endKey") == false) {
                     BusPassengerServiceManager.arriveDest(
                         mContext, lindId = it, object : OchCommonServiceCallback<BaseData> {
                             override fun onSuccess(data: BaseData?) {
                                 if (null != data && 0 == data.code) {
                                     VoiceManager.arrivedStation(
                                         orderInfo!!.siteName!!,
-                                        orderInfo!!.siteNameKr!!,
+                                        orderInfo!!.siteNameKr ?: "",
                                         VoiceFocusManager.getVoiceCmdCallBack()
                                     )
-                                    broadcastList["${it}$endKey"] = true
+                                    broadcastList["${siteId}$endKey"] = true
                                     // 到站结束自驾
                                     CallerAutoPilotControlManager.cancelAutoPilot()
                                     // 结束路距计算
@@ -874,16 +875,18 @@ object CharterPassengerModel {
                             }
                         })
                 }
+                }
             }
         }
     }
 
+    fun cleanbroadcastListInfo(){
+        broadcastList.clear()
+    }
+
     fun leaveStation() {
         orderInfo?.siteName?.let {cn->
-            orderInfo?.siteNameKr?.let {kr->
-                VoiceManager.leaveStation(cn,kr, VoiceFocusManager.getVoiceCmdCallBack())
-            }
-
+            VoiceManager.leaveStation(cn,orderInfo?.siteNameKr?:"", VoiceFocusManager.getVoiceCmdCallBack())
         }
     }
 
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
index 6e17e00b9f..6bbc80bb3a 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -80,6 +80,9 @@ class MainFragment :
                 ToastUtils.showShort(AbsMogoApplication.getApp().getString(R.string.m1_please_login_driver))
             }
         }
+        ll_car_speed.setOnClickListener {
+            CharterPassengerModel.arriveDest()
+        }
 
         viewBusPM1MsgBoxButton.setClickListener(object : MMsgBoxButtonView.ClickListener {
             override fun showMsgBoxList(show: Boolean) {
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
index 138d2c8079..f604e7ac28 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
@@ -442,6 +442,7 @@ class LineSiteView @JvmOverloads constructor(
                                 }
                                 go2StartCar()
                                 CharterPassengerModel.queryOrder()
+                                CharterPassengerModel.cleanbroadcastListInfo()
                             } else {
                                 tempCheckLineIsSubmit = true
                                 ToastUtils.showShort("司机端拒绝请重新选择")