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 5196738729..ae3fd5f88a 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 @@ -118,7 +118,7 @@ public class MoGoHandAdasMsgManager implements if (!AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { //小巴不展示 if (gnssInfo != null) { //设置刹车信息 - if (gnssInfo.getAcceleration() < SharedPrefsMgr.getInstance(mContext).getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD,-2.5F)) { + if (gnssInfo.getAcceleration() < SharedPrefsMgr.getInstance(mContext).getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD, -2.5F)) { brakeLight = 1; } else { brakeLight = 0; @@ -132,6 +132,7 @@ public class MoGoHandAdasMsgManager implements /** * 车辆方向盘转向角回调 + * * @param steering 方向盘转向角 */ @Override @@ -141,6 +142,7 @@ public class MoGoHandAdasMsgManager implements /** * 车辆挂挡档位 + * * @param gear 档位 */ @Override 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 113e39c287..12ce7c1634 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 @@ -141,6 +141,16 @@ public class TrafficDataView extends ConstraintLayout { String accStr = myformat.format(carAcc); accTextView.setText("a: " + accStr); } + + @Override + public void onAutopilotBrake(float brake) { + Log.d(TAG, "刹车:" + String.valueOf(brake)); + } + + @Override + public void onAutopilotThrottle(float throttle) { + Log.d(TAG, "油门:" + String.valueOf(throttle)); + } }; /** diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt index 7d6520926d..75bde9e46f 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt @@ -42,4 +42,14 @@ interface IMoGoAutopilotVehicleStateListener { * 车辆加速度 */ fun onAutopilotAcc(carAcc: Float) + + /** + * 油门 + */ + fun onAutopilotThrottle(throttle: Float) + + /** + * 刹车 + */ + fun onAutopilotBrake(brake: Float) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt index 3c5fef077a..df4cd2c638 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt @@ -112,6 +112,26 @@ object CallerAutopilotVehicleStateListenerManager : CallerBase() { } } + /** + * throttle 油门 + */ + fun invokeAutopilotThrottle(throttle: Float){ + M_AUTOPILOT_VEHICLE_LISTENERS.forEach{ + val listener = it.value + listener.onAutopilotThrottle(throttle) + } + } + + /** + * brake 刹车 + */ + fun invokeAutopilotBrake(brake: Float){ + M_AUTOPILOT_VEHICLE_LISTENERS.forEach{ + val listener = it.value + listener.onAutopilotBrake(brake) + } + } + /** * 工控机时间回调