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;