From 64f4f4a510209b697a2a673571edafdf61bd4078 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Wed, 8 May 2024 11:46:49 +0800 Subject: [PATCH 1/4] [6.4.0] add log --- .../core/function/hmi/ui/setting/StatusSummaryView.kt | 7 ++++++- .../autopilot/CallerAutopilotCarConfigListenerManager.kt | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 Date: Wed, 8 May 2024 11:48:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[6.4.0]=20[15=E7=B1=B3=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=87=AA=E9=A9=BE=E6=B7=BB=E5=8A=A0tts]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/model/OrderModel.java | 2 ++ .../module/manager/distance/TrajectoryAndDistanceManager.kt | 4 ++-- .../src/main/java/com/mogo/och/shuttle/model/OrderModel.java | 2 ++ .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 1 + .../com/mogo/och/taxi/passenger/model/AutopilotManager.kt | 1 + .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) 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; } } From 4c34d2c064ec081d736b446040e44291a5896e8a Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 8 May 2024 11:48:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[640][adas]=20=E5=B0=81=E6=9D=BF=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E9=A2=91=E7=B9=81=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/ability/BaseAutopilotAbilityChassis.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java index b02ad1d26b..76b8a73ac7 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/BaseAutopilotAbilityChassis.java @@ -2,7 +2,6 @@ package com.zhidao.support.adas.high.common.autopilot.ability; import androidx.annotation.NonNull; -import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; import java.util.ArrayList; @@ -143,10 +142,10 @@ public abstract class BaseAutopilotAbilityChassis { if (oldThrottle == Float.MAX_VALUE) { oldThrottle = throttle; } else { - CupidLogUtils.log(TAG, "方向盘当前角度=" + oldThrottle + " 方向盘1秒前角度=" + throttle); +// CupidLogUtils.log(TAG, "方向盘当前角度=" + oldThrottle + " 方向盘1秒前角度=" + throttle); boolean isTurning = Math.abs(throttle - oldThrottle) > 8.0F; oldThrottle = throttle; - CupidLogUtils.log(TAG, "方向盘是否转动=" + isTurning); +// CupidLogUtils.log(TAG, "方向盘是否转动=" + isTurning); if (isTurning) { unableAutopilotReasons = manager.addUnableAutopilotReason(unableAutopilotReasons, UnableLaunchReason.SourceType.CHASSIS, UnableLaunchReason.UnableType.CHASSIS_STEERING, REASON_CHASSIS_STEERING); } From 3ed5fbf31c0c492d74517ffc86518c405786f474 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 8 May 2024 12:26:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[6.4.0]=20[fix]=20[=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=B0=B1=E7=BB=AA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/shuttle/model/OrderModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 86ee66ec22..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 @@ -492,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 @@ -816,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();