From e21a4953ba66db60fa2c00ddb4130fc257f9d317 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 27 Jul 2022 14:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B9=E8=BD=A6=20=E6=B2=B9=E9=97=A8?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=91=88=E7=8E=B0,=E6=97=A0=E4=BC=98?= =?UTF-8?q?=E5=85=88=E7=BA=A7,=E8=B0=81=E6=9C=89=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E6=9B=BF=E6=8D=A2=E6=88=90=E8=B0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 7 +++++++ .../adapter/MoGoHandAdasMsgManager.java | 10 ++++++++++ .../status/flow/can/CanImpl.kt | 10 ++++++++++ .../function/hmi/ui/setting/DebugSettingView.kt | 16 +++++++++++++++- .../hmi/ui/widget/SteeringWheelView.java | 16 ++++++++++++++++ .../function/hmi/ui/widget/TrafficDataView.java | 2 ++ 6 files changed, 60 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index c86a419ef2..83dbe41e04 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -155,6 +155,13 @@ class MoGoAdasListenerImpl : OnAdasListener { CallerAutopilotVehicleStateListenerManager.invokeAutopilotSteeringData(vehicleState.steering) //挂挡档位数据 CallerAutopilotVehicleStateListenerManager.invokeAutopilotGearData(vehicleState.gear) + //加速度 + CallerAutopilotVehicleStateListenerManager.invokeAutopilotAcc(vehicleState.accel) + //油门 + CallerAutopilotVehicleStateListenerManager.invokeAutopilotThrottle(vehicleState.throttle) + //刹车 + CallerAutopilotVehicleStateListenerManager.invokeAutopilotThrottle(vehicleState.brake) + } else { CallerAutopilotVehicleStateListenerManager.invokeAutopilotDataException(header.timestamp.toLong()) } diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index ae3fd5f88a..00962377ac 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -158,4 +158,14 @@ public class MoGoHandAdasMsgManager implements public void onAutopilotAcc(float carAcc) { } + + @Override + public void onAutopilotThrottle(float throttle) { + + } + + @Override + public void onAutopilotBrake(float brake) { + + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt index 3ac02babae..0e254a00b2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt @@ -71,6 +71,16 @@ internal class CanImpl(ctx: Context): IFlow(ctx), IMoGoAutopilotVehic timeOutCheck() } + override fun onAutopilotThrottle(throttle: Float) { + send(CanStatus(isCanEnabled())) + timeOutCheck() + } + + override fun onAutopilotBrake(brake: Float) { + send(CanStatus(isCanEnabled())) + timeOutCheck() + } + override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?) { super.onAutopilotGuardian(guardianInfo) send(CanStatus(isCanEnabled())) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index c0cf454759..bd5242473c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -1959,7 +1959,21 @@ class DebugSettingView @JvmOverloads constructor( * 车辆加速度 */ override fun onAutopilotAcc(carAcc: Float) { - TODO("Not yet implemented") + + } + + /** + * 油门 + */ + override fun onAutopilotThrottle(throttle: Float) { + + } + + /** + * 刹车 + */ + override fun onAutopilotBrake(brake: Float) { + } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index b7b0725c9b..7fb56ed8d9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -158,6 +158,22 @@ public class SteeringWheelView extends ConstraintLayout { private final IMoGoAutopilotVehicleStateListener mIMoGoAutopilotVehicleStateListener = new IMoGoAutopilotVehicleStateListener() { + /** + * @param brake 刹车 + */ + @Override + public void onAutopilotBrake(float brake) { + + } + + /** + * @param throttle 油门 + */ + @Override + public void onAutopilotThrottle(float throttle) { + + } + /** * 车辆转向灯 * @param lightSwitch diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java index 12ce7c1634..07ab15b376 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java @@ -145,11 +145,13 @@ public class TrafficDataView extends ConstraintLayout { @Override public void onAutopilotBrake(float brake) { Log.d(TAG, "刹车:" + String.valueOf(brake)); + brakeStatus.setImageResource(R.drawable.traffic_data_brake); } @Override public void onAutopilotThrottle(float throttle) { Log.d(TAG, "油门:" + String.valueOf(throttle)); + brakeStatus.setImageResource(R.drawable.traffic_data_accelerator); } };