diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index b6e6770a2b..e26549b209 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -77,6 +77,7 @@ import com.mogo.och.common.module.utils.NumberFormatUtil; import com.mogo.och.common.module.utils.OCHThreadPoolManager; import com.mogo.och.common.module.utils.PinYinUtil; import com.mogo.och.common.module.utils.ToastUtilsOch; +import com.mogo.och.common.module.voice.VoiceNotice; import org.jetbrains.annotations.NotNull; @@ -642,6 +643,7 @@ public class OrderModel { } if(!StringUtils.isEmpty(resion)){ ToastUtils.showShort(resion); + VoiceNotice.showNotice(resion); return; } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt index 431463ec97..c4b765ca1c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt @@ -723,7 +723,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { return if (distance <= OchCommonConst.AUTOMATIC_PLANNING_MAX_DISTANCE) { "" } else { - "距离起始站点过远:${distance}米" + "距离起始站点超过15米" } } @@ -749,7 +749,7 @@ object TrajectoryAndDistanceManager : IMoGoPlanningRottingListener { } } OchChainLogManager.writeChainLog("启动自驾距离判断","距离轨迹线超过15m,无法启动自驾", eventID = OchChainLogManager.EVENT_KEY_INFO_AUTOPILOT_DISTANCE) - return "距离轨迹线超过15m,无法启动自驾" + return "距离轨迹线超过15米" } } \ No newline at end of file diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java index c329d8a4eb..86ee66ec22 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java @@ -25,6 +25,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager; import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; +import com.mogo.och.common.module.voice.VoiceNotice; import com.mogo.och.shuttle.bean.BusRoutesResponse; import com.mogo.och.shuttle.util.ShuttleVoiceManager; import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg; @@ -660,6 +661,7 @@ public class OrderModel { } if(!StringUtils.isEmpty(resion)){ ToastUtils.showShort(resion); + VoiceNotice.showNotice(resion); return; } //4、ssm 给出数据 diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 70908be27e..d3f6809370 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -950,6 +950,7 @@ public class TaxiModel { } if(!StringUtils.isEmpty(resion)){ ToastUtils.showShort(resion); + VoiceNotice.showNotice(resion); return; } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index a8c152977c..7e5c4fba8b 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt @@ -83,6 +83,7 @@ object AutopilotManager : IOchAutopilotStatusListener { } if (!StringUtils.isEmpty(resion)) { ToastUtils.showShort(resion) + VoiceNotice.showNotice(resion); return resion } // 4、ssm 给出数据 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index da6b358a7b..ebd3871368 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -1248,6 +1248,7 @@ object TaxiTaskModel { val resion = TrajectoryAndDistanceManager.canStartAutopilot(it.lineId) if(!StringUtils.isEmpty(resion)){ ToastUtils.showShort(resion); + VoiceNotice.showNotice(resion); return; } }