From 07188d617dcff01df4fee78d32b090e2091144da Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Fri, 4 Aug 2023 18:25:36 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0][adas-data][data-centre]=E8=83=BD?= =?UTF-8?q?=E5=90=A6=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8A=A0=E5=85=A5=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A4=9A=E6=9D=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=B8=8A=E6=8A=A5=EF=BC=9B=E9=B9=B0=E7=9C=BC?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E4=B8=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=BA=8B=E4=BB=B6=E8=A7=A6=E5=8F=91=E5=BC=8F=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=9E=8D=E5=90=88=E5=9F=9F?= =?UTF-8?q?=E6=8E=A7=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E7=AD=89=EF=BC=9B=E5=8A=A0=E5=85=A5=E4=B8=BB=E5=8A=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BD=93=E5=89=8D=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ability/AutopilotAbility230.java | 5 ++-- .../ability/AutopilotAbility250.java | 4 ++-- .../ability/AutopilotAbility330.java | 24 +++++++++---------- .../ability/AutopilotAbilityManager.java | 1 - 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java index 14c5419ff2..e7c6801119 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility230.java @@ -5,7 +5,6 @@ import androidx.annotation.Nullable; import com.zhjt.mogo.adas.data.bean.UnableAutopilotReason; import java.util.ArrayList; -import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -58,7 +57,7 @@ public class AutopilotAbility230 { } } //TODO 关于手刹：不同车型的实现不同所以目前没法使用此字段 -// if (isAutopilotAbility) { + // //电子驻车制动系统 // if (chassisStates.hasEpbSystemStates()) { // ChassisStatesOuterClass.EPBSystemStates epb = chassisStates.getEpbSystemStates(); @@ -66,7 +65,7 @@ public class AutopilotAbility230 { // epb.getEpbWorkState(); // } // } -// } + } if (listener != null) { listener.onAutopilotAbility(isAutopilotAbility, unableAutopilotReasons); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java index f35791588b..7dc31cb07f 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility250.java @@ -148,7 +148,7 @@ public class AutopilotAbility250 { } } //TODO 关于手刹：不同车型的实现不同所以目前没法使用此字段 -// if (isAutopilotAbility) { + // //电子驻车制动系统 // if (chassisStates.hasEpbSystemStates()) { // ChassisStatesOuterClass.EPBSystemStates epb = chassisStates.getEpbSystemStates(); @@ -156,7 +156,7 @@ public class AutopilotAbility250 { // epb.getEpbWorkState(); // } // } -// } + } if (listener != null) { listener.onAutopilotAbility(isAutopilotAbility, unableAutopilotReasons); diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java index df14a4a8a6..1dbcdeb4b9 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbility330.java @@ -134,21 +134,19 @@ public class AutopilotAbility330 { isAutopilotAbility = false;//是否能启动自动驾驶 unableAutopilotReasons = AutopilotAbilityManager.getInstance().addUnableAutopilotReason(unableAutopilotReasons, UnableAutopilotReason.SourceType.LIB, "SSM状态查询超时无响应"); } - if (isAutopilotAbility) { - if (fsmStatusReasonRespond != null) { - int count = fsmStatusReasonRespond.getFsmStatusReasonRespondCount(); - if (count > 0) { - isAutopilotAbility = false; - for (int i = 0; i < count; i++) { - String respond = fsmStatusReasonRespond.getFsmStatusReasonRespond(i); - if (!TextUtils.isEmpty(respond)) { - unableAutopilotReasons = AutopilotAbilityManager.getInstance().addUnableAutopilotReason(unableAutopilotReasons, UnableAutopilotReason.SourceType.FSM, respond); - } - } - if (unableAutopilotReasons == null || unableAutopilotReasons.isEmpty()) { - unableAutopilotReasons = AutopilotAbilityManager.getInstance().addUnableAutopilotReason(unableAutopilotReasons, UnableAutopilotReason.SourceType.LIB, "FSM未给出原因"); + if (fsmStatusReasonRespond != null) { + int count = fsmStatusReasonRespond.getFsmStatusReasonRespondCount(); + if (count > 0) { + isAutopilotAbility = false; + for (int i = 0; i < count; i++) { + String respond = fsmStatusReasonRespond.getFsmStatusReasonRespond(i); + if (!TextUtils.isEmpty(respond)) { + unableAutopilotReasons = AutopilotAbilityManager.getInstance().addUnableAutopilotReason(unableAutopilotReasons, UnableAutopilotReason.SourceType.FSM, respond); } } + if (unableAutopilotReasons == null || unableAutopilotReasons.isEmpty()) { + unableAutopilotReasons = AutopilotAbilityManager.getInstance().addUnableAutopilotReason(unableAutopilotReasons, UnableAutopilotReason.SourceType.LIB, "FSM未给出原因"); + } } } if (listener != null) { diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java index 4dc2a84f90..14e567760e 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/autopilot/ability/AutopilotAbilityManager.java @@ -12,7 +12,6 @@ import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhjt.mogo.adas.data.bean.UnableAutopilotReason; import java.util.ArrayList; -import java.util.List; import java.util.Set; import java.util.Timer; import java.util.TimerTask;