From 59d48423b697f9bf044910b0e5f88945f0550dfc Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 29 Mar 2023 20:10:54 +0800
Subject: [PATCH] =?UTF-8?q?[mini=20bus2.0.0]=20=E5=A4=84=E7=90=86=E5=8C=85?=
 =?UTF-8?q?=E8=BD=A6=E9=9F=A9=E8=AF=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/response/OrderInfoResponse.kt        |  2 ++
 .../passenger/model/CharterPassengerModel.kt  | 28 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt
index 9d05dc05e0..c510232abf 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt
@@ -14,8 +14,10 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() {
         val lineName: String?,//线路名称
         var startSiteId: Int?,
         var startSiteName: String?,
+        var startSiteNameKr: String?,
         val siteId: Long?,//站点id
         val siteName: String?,//站点名称
+        val siteNameKr: String?,//站点名称
         val wgs84Lat: Double?,
         val wgs84Lon: Double?,
         var gcj02Lat: Double?,
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 f0be5f21dc..8f38ab143a 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
@@ -548,11 +548,7 @@ object CharterPassengerModel {
                                                 AbsMogoApplication.getApp()
                                                     .getString(R.string.m1_end_order_5min), 2
                                             )
-                                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                                VoiceManager.surplus5min(VoiceFocusManager.getVoiceCmdCallBack())
-                                            }else{
-                                                VoiceManager.surplus5min()
-                                            }
+                                            VoiceManager.surplus5min(VoiceFocusManager.getVoiceCmdCallBack())
                                             CallerLogger.d(M_BUS_P+ TAG,"倒计时5分钟${it.orderNo}")
                                             SharedPrefs.getInstance(mContext).putBoolean("${it.orderNo}$min5Speak",true)
                                         }
@@ -858,12 +854,11 @@ object CharterPassengerModel {
                         mContext, lindId = it, object : OchCommonServiceCallback<BaseData> {
                             override fun onSuccess(data: BaseData?) {
                                 if (null != data && 0 == data.code) {
-                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                        VoiceManager.arrivedStation(orderInfo!!.siteName!!,
-                                            VoiceFocusManager.getVoiceCmdCallBack())
-                                    }else{
-                                        VoiceManager.arrivedStation(orderInfo!!.siteName!!,)
-                                    }
+                                    VoiceManager.arrivedStation(
+                                        orderInfo!!.siteName!!,
+                                        orderInfo!!.siteNameKr!!,
+                                        VoiceFocusManager.getVoiceCmdCallBack()
+                                    )
                                     broadcastList["${it}$endKey"] = true
                                     // 到站结束自驾
                                     CallerAutoPilotControlManager.cancelAutoPilot()
@@ -883,13 +878,12 @@ object CharterPassengerModel {
         }
     }
 
-    fun leaveStation(){
-        orderInfo?.siteName?.let {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                VoiceManager.leaveStation(it,VoiceFocusManager.getVoiceCmdCallBack())
-            }else{
-                VoiceManager.leaveStation(it)
+    fun leaveStation() {
+        orderInfo?.siteName?.let {cn->
+            orderInfo?.siteNameKr?.let {kr->
+                VoiceManager.leaveStation(cn,kr, VoiceFocusManager.getVoiceCmdCallBack())
             }
+
         }
     }