yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus_network_weak_230323

Browse Source
This commit is contained in:
yangyakun
2023-03-29 17:59:20 +08:00
parent 7bbb65bf9c 8528eac080
commit 46870bb805
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -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())
}
}

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/utils/VoiceFocusManager.kt
View File

@@ -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()

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
View File

@@ -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}")
}
}
}