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

[m1]

Browse Source 
[不需要兼容]
This commit is contained in:
yangyakun
2023-03-29 15:03:39 +08:00
parent 130d82dd9f
commit 8528eac080
2 changed files with 5 additions and 18 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() AbsMogoApplication.getApp()
.getString(R.string.m1_end_order_5min), 2 .getString(R.string.m1_end_order_5min), 2
) )
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { VoiceManager.surplus5min(VoiceFocusManager.getVoiceCmdCallBack())
VoiceManager.surplus5min(VoiceFocusManager.getVoiceCmdCallBack())
}else{
VoiceManager.surplus5min()
}
CallerLogger.d(M_BUS_P+ TAG,"倒计时5分钟${it.orderNo}") CallerLogger.d(M_BUS_P+ TAG,"倒计时5分钟${it.orderNo}")
SharedPrefs.getInstance(mContext).putBoolean("${it.orderNo}$min5Speak",true) SharedPrefs.getInstance(mContext).putBoolean("${it.orderNo}$min5Speak",true)
} }
@@ -858,12 +854,7 @@ object CharterPassengerModel {
mContext, lindId = it, object : OchCommonServiceCallback<BaseData> { mContext, lindId = it, object : OchCommonServiceCallback<BaseData> {
override fun onSuccess(data: BaseData?) { override fun onSuccess(data: BaseData?) {
if (null != data && 0 == data.code) { if (null != data && 0 == data.code) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { VoiceManager.arrivedStation(orderInfo!!.siteName!!, VoiceFocusManager.getVoiceCmdCallBack())
VoiceManager.arrivedStation(orderInfo!!.siteName!!,
VoiceFocusManager.getVoiceCmdCallBack())
}else{
VoiceManager.arrivedStation(orderInfo!!.siteName!!,)
}
broadcastList["${it}$endKey"] = true broadcastList["${it}$endKey"] = true
// 到站结束自驾 // 到站结束自驾
CallerAutoPilotControlManager.cancelAutoPilot() CallerAutoPilotControlManager.cancelAutoPilot()
@@ -883,13 +874,9 @@ object CharterPassengerModel {
} }
} }
fun leaveStation(){ fun leaveStation() {
orderInfo?.siteName?.let { orderInfo?.siteName?.let {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { VoiceManager.leaveStation(it, VoiceFocusManager.getVoiceCmdCallBack())
VoiceManager.leaveStation(it,VoiceFocusManager.getVoiceCmdCallBack())
}else{
VoiceManager.leaveStation(it)
}
} }
} }

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 import com.shuyu.gsyvideoplayer.GSYVideoManager
object VoiceFocusManager { object VoiceFocusManager {
@RequiresApi(Build.VERSION_CODES.O)
fun getVoiceCmdCallBack():IMogoVoiceCmdCallBack{ fun getVoiceCmdCallBack():IMogoVoiceCmdCallBack{
UiThreadHandler.post { UiThreadHandler.post {
GSYVideoManager.onPause() GSYVideoManager.onPause()