diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
index 7b105cfaa5..43d67fdb28 100644
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
@@ -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("车辆系统繁忙,请稍后再试")
}
}
}
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml
index aed8c7aa75..f10ba68acd 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/values/strings.xml
@@ -23,7 +23,8 @@
KM/h
- 正在为您靠边停车,请坐稳扶好
+ 正在为您靠边停车,扶稳坐好哟
+ 靠边停车成功
请安全员登录司机屏
包车将在5分钟后结束,结束后我们将自动为您寻找停车点
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
index 537cd55dff..7934b36787 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt
@@ -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{
- "车辆正在运行、请稍后再试"
+ "车辆行驶中不可以开门哦~"
}
}
}