From 8528eac080e87dba960a673a0894de099d44ff39 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 29 Mar 2023 15:03:39 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[=E4=B8=8D=E9=9C=80=E8=A6=81=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/model/CharterPassengerModel.kt  | 21 ++++---------------
 .../bus/passenger/utils/VoiceFocusManager.kt  |  2 +-
 2 files changed, 5 insertions(+), 18 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 f0be5f21dc..6b1d9f2c97 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,7 @@ 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!!, VoiceFocusManager.getVoiceCmdCallBack())
                                     broadcastList["${it}$endKey"] = true
                                     // 到站结束自驾
                                     CallerAutoPilotControlManager.cancelAutoPilot()
@@ -883,13 +874,9 @@ object CharterPassengerModel {
         }
     }
 
-    fun leaveStation(){
+    fun leaveStation() {
         orderInfo?.siteName?.let {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                VoiceManager.leaveStation(it,VoiceFocusManager.getVoiceCmdCallBack())
-            }else{
-                VoiceManager.leaveStation(it)
-            }
+            VoiceManager.leaveStation(it, VoiceFocusManager.getVoiceCmdCallBack())
         }
     }
 
diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
index 4544adf90a..5e1dad8231 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
@@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 
 object VoiceFocusManager {
-    @RequiresApi(Build.VERSION_CODES.O)
+
     fun getVoiceCmdCallBack():IMogoVoiceCmdCallBack{
         UiThreadHandler.post {
             GSYVideoManager.onPause()