From 130d82dd9f059c16c05b59b802180a6dd42096ab Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 28 Mar 2023 17:43:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=8Cdev=5Frobobus-d=5F230322=5F3.0.0?= =?UTF-8?q?=E3=80=8D=E6=9B=B4=E6=94=B9=E5=88=B0=E7=AB=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/function/biz/dispatch/DispatchAutoPilotManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt index 18ef4a0781..cfd1e51e72 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt @@ -314,11 +314,11 @@ class DispatchAutoPilotManager private constructor() : receiverBean?.let { //调度完成，同步云端，并且吐司提示 dispatchServiceModel.dispatchResultUpload(DISPATCH_COMPLETED, it.taskId) - ToastUtils.showLong("云调度完成，车辆即将到达${it.endLocAddress}") + ToastUtils.showLong("云调度完成，车辆已到达${it.endLocAddress}") //取消自动驾驶 CallerAutoPilotControlManager.cancelAutoPilot() //语音提示到站 - AIAssist.getInstance(mContext).speakTTSVoice("云调度完成，车辆即将到达${it.endLocAddress}") + AIAssist.getInstance(mContext).speakTTSVoice("云调度完成，车辆已到达${it.endLocAddress}") } } } From 8528eac080e87dba960a673a0894de099d44ff39 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 29 Mar 2023 15:03:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[m1]=20[=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=85=BC=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 { 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()