From bfe95019a473a7526dbceaf67c7c857fd2999537 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 27 Jul 2022 10:20:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[add]=20=E5=88=B9=E8=BD=A6=20=E6=B2=B9?= =?UTF-8?q?=E9=97=A8=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/TrafficDataView.java | 3 +++ .../traffic_data_accelerator.png | Bin 0 -> 6484 bytes .../traffic_data_brake.png | Bin 0 -> 5649 bytes .../amap_reset_passenger.png | Bin 0 -> 13035 bytes .../src/main/assets/over_view_style_bus.data | Bin 58605 -> 58691 bytes .../assets/over_view_style_extra_bus.data | Bin 8926 -> 15198 bytes 6 files changed, 3 insertions(+) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_accelerator.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_brake.png create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset_passenger.png 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 fa1b973b0e..113e39c287 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 @@ -36,6 +36,8 @@ public class TrafficDataView extends ConstraintLayout { private TextView speedTextView; private TextView accTextView; private ImageView speedImage; + private ImageView brakeStatus; + //圆弧颜色 private int mArcColor; @@ -67,6 +69,7 @@ public class TrafficDataView extends ConstraintLayout { speedImage = findViewById(R.id.speedImage); speedTextView = findViewById(R.id.speedTextView); accTextView = findViewById(R.id.speedAccTextView); + brakeStatus = findViewById(R.id.brakeStatus); } private final IMoGoAutopilotVehicleStateListener mIMoGoAutopilotVehicleStateListener = new IMoGoAutopilotVehicleStateListener() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_accelerator.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/traffic_data_accelerator.png new file mode 100644 index 0000000000000000000000000000000000000000..ef80c1234cfe3d5a2f191c695613d16923f8c088 GIT binary patch literal 6484 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 literal 0 HcmV?d00001 diff --git a/core/mogo-core-res/src/main/assets/over_view_style_bus.data b/core/mogo-core-res/src/main/assets/over_view_style_bus.data index 4deed98e6a1ae45541c64b288d21f5a77c712730..2fdafcbf19fed0d025f9d73c2bf2c2f5ef7a8573 100644 GIT binary patch delta 4703 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 diff --git a/core/mogo-core-res/src/main/assets/over_view_style_extra_bus.data b/core/mogo-core-res/src/main/assets/over_view_style_extra_bus.data index a3c0811e86a6f11f16ca16fc136a8c0f69b87092..01f7f2116ecf898b4b694db6f591728d6361cd46 100644 GIT binary patch delta 13730 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 M`&I=>`_^Vt1Fl4>KmY&$ delta 7409 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 From 6717ca1c33e99e9acd0f2b419a35bed4590dbd4f Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 27 Jul 2022 11:47:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B2=B9=E9=97=A8=E5=88=B9=E8=BD=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E4=BE=9Bbus=E4=BD=BF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/MoGoHandAdasMsgManager.java | 4 +++- .../hmi/ui/widget/TrafficDataView.java | 10 ++++++++++ .../IMoGoAutopilotVehicleStateListener.kt | 10 ++++++++++ ...lerAutopilotVehicleStateListenerManager.kt | 20 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) 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) + } + } + /** * 工控机时间回调 From e21a4953ba66db60fa2c00ddb4130fc257f9d317 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 27 Jul 2022 14:57:29 +0800 Subject: [PATCH 3/3] =?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); } };