From a7ef37e0a306e727e61bac205f6c27a4d2b85b04 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 13 Aug 2021 15:55:50 +0800 Subject: [PATCH] add can lib --- config.gradle | 3 ++- modules/mogo-module-adas/build.gradle | 1 + .../mogo/module/adas/AdasEventManager.java | 27 +++++++++++++++++++ .../service/impl/adas/MogoADASController.java | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index e9a2943da3..f502144130 100644 --- a/config.gradle +++ b/config.gradle @@ -172,7 +172,8 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", // mebulaobu : 'com.zhidao.support.nebulaobu:nebulaobu:1.0.0.3', - mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.10', + mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.11', + mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.1', // 左侧面板 moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}", diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle index 9cff527003..d1b05bc879 100644 --- a/modules/mogo-module-adas/build.gradle +++ b/modules/mogo-module-adas/build.gradle @@ -46,6 +46,7 @@ dependencies { compileOnly rootProject.ext.dependencies.adasapi api "com.zhidao.support.adas:high:1.2.0.2" + implementation rootProject.ext.dependencies.mogoami annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index a79b1a81d2..48d3f447ec 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -21,6 +21,7 @@ import com.zhidao.support.adas.high.bean.ObstaclesInfo; import com.zhidao.support.adas.high.bean.RectInfo; import com.zhidao.support.adas.high.bean.WarnMessageInfo; import com.zhidao.support.adas.high.common.MsgActionType; +import com.zhidao.support.obu.ami.AmiClientManager; import java.util.ArrayList; import java.util.concurrent.TimeUnit; @@ -144,6 +145,32 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL listener.ownerCarStateInfo(gson.toJson(carStateInfo)); } } + + //can数据转发 + CarStateInfo.ValuesBean bean = carStateInfo.getValues(); + if (bean != null) { + int turn_light = bean.getTurn_light(); //转向灯状态 0是正常 1是左转 2是右转 + if (turn_light == 0) { + AmiClientManager.getInstance().setLeft_turn_signal(1); + AmiClientManager.getInstance().setRight_turn_signal(1); + } else if (turn_light == 1) { + AmiClientManager.getInstance().setLeft_turn_signal(2); + AmiClientManager.getInstance().setRight_turn_signal(1); + } else if (turn_light == 2) { + AmiClientManager.getInstance().setLeft_turn_signal(1); + AmiClientManager.getInstance().setRight_turn_signal(2); + } + +// int flash_light = bean.getFlash_light(); //双闪灯状态 +// +// if (flash_light == 0) { +// AmiClientManager.getInstance().setHazard_signal(1); +// } else { +// AmiClientManager.getInstance().setHazard_signal(2); +// } + + int brake_light = bean.getBrake_light(); //刹车灯状态 + } } @Override diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index b5060af0d3..ee4139cb22 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -394,6 +394,8 @@ public class MogoADASController implements IMogoADASController { Message message = mAdasLocationRecHandler.obtainMessage(); message.obj = ownerCarStateInfo; message.sendToTarget(); + + } @Override