From f50663e8b69537578ec83bd14fa7ed9e7320af59 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 22 Sep 2023 16:13:01 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=20=E5=8E=BB=E9=99=A4=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OCHAdasAbilityManager.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java index 93f2d426bf..12c407c763 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/autopilotmanager/OCHAdasAbilityManager.java @@ -6,7 +6,6 @@ import androidx.annotation.Nullable; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatisticsListener; -import com.mogo.eagle.core.function.api.autopilot.IMoGoParallelDrivingActionsListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager; @@ -24,7 +23,7 @@ import java.util.ArrayList; * 工控机状态信息回调（判断是否能否启动自动驾驶的回调） * 目前定的是3秒回调一次 */ -public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMoGoAutopilotStatisticsListener, IMoGoParallelDrivingActionsListener { +public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMoGoAutopilotStatisticsListener { private static final String TAG = OCHAdasAbilityManager.class.getSimpleName(); @@ -89,8 +88,6 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo //2022.10.9 工控机状态信息回调（判断是否能否启动自动驾驶的回调）， 目前定的是3秒回调一次 CallerAutopilotActionsListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotStatisticsListenerManager.INSTANCE.addListener(TAG,this); - //map3.6.0且是东风或者红旗的时候返回 - CallerParallelDrivingActionsListenerManager.INSTANCE.addListener(TAG,this); } private void releaseListeners() { @@ -115,7 +112,6 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo } } - @Override public void onAutopilotStatistics(@Nullable AutopilotStatistics statistics) { if (statistics == null) return; @@ -129,20 +125,6 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo } } - @Override - public void onParallelDrivingAbility(boolean isParallelDrivingAbility, @Nullable ArrayList unableParallelDrivingReasons) { - if (unableParallelDrivingReasons != null && getMapVersion() >= 30600) { - //刹车变化回调 - Logger.d(TAG,"onParallelDrivingAbility = " + isParallelDrivingAbility + - " unableParallelDrivingReasons =" + unableParallelDrivingReasons.toString()); - if (unableParallelDrivingReasons.toString().contains(UnableLaunchReason.SourceType.CHASSIS.name()) - && unableParallelDrivingReasons.toString().contains(UnableLaunchReason.UnableType.BRAKE.name())) { - failureCallback.brakeStatusChanged(isParallelDrivingAbility); - } - - } - } - private int getMapVersion(){ return ParseVersionUtils.parseVersion(true, CallerAutoPilotStatusListenerManager.INSTANCE.getDockerVersion()); }