From 568eadd185d6f872f11986deed82ccc6ca50efb2 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Mar 2022 11:12:32 +0800 Subject: [PATCH] fixed bug --- .../adapter/MoGoHandAdasMsgManager.java | 5 ++++- .../data/autopilot/AutopilotCarStateInfo.java | 16 ++++++++++++++++ 2 files changed, 20 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 12ee0d18fb..3de8df06cd 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 @@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.module.common.drawer.IdentifyDataDrawer; +import com.zhidao.support.adas.high.bean.CarStateInfo; import com.zhidao.support.obu.ami.AmiClientManager; import java.util.ArrayList; @@ -50,9 +51,11 @@ public class MoGoHandAdasMsgManager implements if (autoPilotCarStateInfo != null) { //can数据转发 AutopilotCarStateInfo.ValuesBean bean = autoPilotCarStateInfo.getValues(); + if (bean != null) { //转向灯状态 0是正常 1是左转 2是右转 - int turnLight = bean.getTurn_light(); + //turnLightOften 是sdk适配的字段,后期建议CarStateInfo和AutopilotCarStateInfo统一成一个 + int turnLight = bean.getTurnLightOften(); AmiClientManager.getInstance().setTurnLightState(turnLight); int brakeLight = bean.getBrake_light(); // Logger.d(TAG, "onCarStateData ---- turnLight = " + turnLight + "---brakeLight = " + brakeLight); diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotCarStateInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotCarStateInfo.java index f9997eb058..9252adcd22 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotCarStateInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotCarStateInfo.java @@ -81,6 +81,22 @@ public class AutopilotCarStateInfo implements Serializable { private int brake_light; //刹车灯状态 private int frame_num;//统计发包个数 + /** + * 常开 常关 转向灯 + * 0 --关 + * 1 --左转 + * 2 --右转 + */ + private int turnLightOften = 0; + + public int getTurnLightOften() { + return turnLightOften; + } + + public void setTurnLightOften(int turnLightOften) { + this.turnLightOften = turnLightOften; + } + public int getFrame_num() { return frame_num; }