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..301996838f 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; @@ -491,6 +492,10 @@ public class OrderModel { */ public void abortTask() { CallerLogger.d(M_BUS + TAG, "结束当前路线abortTask"); + if(busRoutesResult==null){ + ToastUtils.showLong("数据异常、请稍后再试"); + return; + } OrderServiceManager.abortTask(mContext, busRoutesResult.getTaskId() , new OchCommonServiceCallback() { @Override @@ -660,6 +665,7 @@ public class OrderModel { } if(!StringUtils.isEmpty(resion)){ ToastUtils.showShort(resion); + VoiceNotice.showNotice(resion); return; } //4、ssm 给出数据 @@ -814,6 +820,10 @@ public class OrderModel { */ public void leaveStation() { CallerLogger.d(M_BUS + TAG, "leaveStation-backgroundCurrentStationIndex = " + backgroundCurrentStationIndex); + if(busRoutesResult==null){ + ToastUtils.showLong("数据异常、请稍后再试"); + return; + } String nextStationName = ""; String nextStationNameKr = ""; MogoLocation nextStationPoint = new MogoLocation(); 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; } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt index 49cfb3ced5..4245c24ed1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting import android.content.Context import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.widget.FrameLayout import androidx.recyclerview.widget.LinearLayoutManager @@ -235,7 +236,11 @@ class StatusSummaryView @JvmOverloads constructor( override fun authCrtFile(device: String, root: String) { super.authCrtFile(device, root) + Log.i("emArrow","authCrtFile : $device, certFileResult: ${CallerAutopilotCarConfigListenerManager.getCertFileResult()}") UiThreadHandler.post ({ + if(CallerAutopilotCarConfigListenerManager.getCertFileResult().contains("成功校验")){ + return@post + } if (data.size < 6) return@post data[5].desc = "本机证书已下载" data[5].isException = false @@ -255,7 +260,7 @@ class StatusSummaryView @JvmOverloads constructor( override fun onCertificationResult(msg: String) { super.onCertificationResult(msg) -// Log.i("emArrow","onCertificationResult : $msg") + Log.i("emArrow","onCertificationResult : $msg") if (!SharedPrefsMgr.getInstance().getBoolean( "${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt index dbf75c5c27..a4c5d8d0f4 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotCarConfigListenerManager.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.call.autopilot +import android.util.Log import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.call.base.CallerBase import mogo.telematics.pad.MessagePad @@ -40,6 +41,7 @@ object CallerAutopilotCarConfigListenerManager : CallerBase