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

[charter]

Browse Source 
[3.2.0]
[部分tts]
This commit is contained in:
yangyakun
2023-05-12 11:47:41 +08:00
parent bd701580ed
commit dfef5cba44
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
View File

@@ -227,7 +227,7 @@ class BusPassengerPresenter(view: MainFragment?) :
OCHPlanningStopSideStatusManager.Status.START -> {
VoiceNotice.showNotice(
context.getString(R.string.m1_stop_site_zh),
AIAssist.LEVEL1
AIAssist.LEVEL0
)
}
OCHPlanningStopSideStatusManager.Status.DOING -> {
@@ -235,9 +235,13 @@ class BusPassengerPresenter(view: MainFragment?) :
}
OCHPlanningStopSideStatusManager.Status.EndingSuccess -> {
ToastUtils.showShort("靠边停车成功")
VoiceNotice.showNotice(
context.getString(R.string.m1_stop_site_success),
AIAssist.LEVEL0
)
}
OCHPlanningStopSideStatusManager.Status.EndingFaile -> {
ToastUtils.showShort("靠边停车失败")
ToastUtils.showShort("车辆系统繁忙，请稍后再试")
}
}
}

3
OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml
View File

@@ -23,7 +23,8 @@
<string name="bus_p_m1_speed_unit">KM/h</string>
<string name="m1_stop_site_zh">正在为您靠边停车，请坐稳扶好</string>
<string name="m1_stop_site_zh">正在为您靠边停车，扶稳坐好哟</string>
<string name="m1_stop_site_success">靠边停车成功</string>
<string name="m1_please_login_driver">请安全员登录司机屏</string>
<string name="m1_end_order_5min">包车将在5分钟后结束，结束后我们将自动为您寻找停车点</string>

18
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
View File

@@ -1,9 +1,11 @@
package com.mogo.och.common.module.manager.devicemanage
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.common.module.voice.VoiceNotice
import io.reactivex.disposables.Disposable
object LightAirconditionDoorManager {
@@ -15,7 +17,7 @@ object LightAirconditionDoorManager {
fun go2OpenDoor(isOpen:Boolean){
val canOpenOrCloseDoor = canOpenOrCloseDoor()
if(!canOpenOrCloseDoor.isNullOrBlank()){
ToastUtils.showShort(canOpenOrCloseDoor)
ToastUtils.showLong(canOpenOrCloseDoor)
return
}
RxUtils.disposeSubscribe(dooorSubscribe)
@@ -30,9 +32,17 @@ object LightAirconditionDoorManager {
RxUtils.disposeSubscribe(doorStatusSubscribe)
doorStatusSubscribe = RxUtils.createSubscribe(6000) {
if (LightAirconditionDoorStatusManager.doorStatus.isOpen) {
ToastUtils.showShort("车门无法关闭，请使用车内物理按钮")
ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～")
VoiceNotice.showNotice(
"车辆系统繁忙，稍后再试试吧～",
AIAssist.LEVEL0
)
}else{
ToastUtils.showShort("车门无法开启，请使用车内物理按钮")
ToastUtils.showShort("车辆系统繁忙，稍后再试试吧～")
VoiceNotice.showNotice(
"车辆系统繁忙，稍后再试试吧～",
AIAssist.LEVEL0
)
}
}
}
@@ -42,7 +52,7 @@ object LightAirconditionDoorManager {
return if(location.gnssSpeed<0.01){
null
}else{
"车辆正在运行、请稍后再试"
"车辆行驶中不可以开门哦～"
}
}
}