yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
#	gradle.properties
#	modules/mogo-module-adas/build.gradle
#	modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
#	modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
This commit is contained in:
董宏宇
2021-10-28 10:20:23 +08:00
parent faede749a8 0fea60b5f1
commit 02f5f7cbee
11 changed files with 384 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
View File

@@ -3,6 +3,8 @@ package com.mogo.module.adas;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import com.google.gson.Gson;
import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo;
@@ -22,6 +24,18 @@ import com.mogo.utils.network.utils.GsonUtil;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
import com.zhidao.support.adas.high.AdasManager;
import com.zhidao.support.adas.high.OnAdasMsgConnectStatusListener;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import com.zhidao.support.adas.high.bean.AutopilotStatus;
import com.zhidao.support.adas.high.bean.AutopilotWayArrive;
import com.zhidao.support.adas.high.bean.CarLaneInfo;
import com.zhidao.support.adas.high.bean.CarStateInfo;
import com.zhidao.support.adas.high.bean.LightStatueInfo;
import com.zhidao.support.adas.high.bean.ObstaclesInfo;
import com.zhidao.support.adas.high.bean.RectInfo;
import com.zhidao.support.adas.high.bean.TrajectoryInfo;
import com.zhidao.support.adas.high.bean.WarnMessageInfo;
import com.zhidao.support.adas.high.bean.guardian.AutopilotGuardianInfo;
import com.zhidao.support.adas.high.common.MsgActionType;
import com.zhidao.support.obu.ami.AmiClientManager;
import java.util.ArrayList;
@@ -104,6 +118,18 @@ public class AdasEventManager implements
}
@Override
public void onAutopilotTrajectory(List<TrajectoryInfo> trajectoryList) {
// Log.e("lianglihui","adas onAutopilotTrajectory");
if(trajectoryList != null && trajectoryList.size() >0){
for (IAdasDataListener listener : iAdasEventListeners) {
if (listener != null) {
listener.onAutopilotTrajectory(trajectoryList);
}
}
}
}
@Override
public void onAutopilotSNRequest() {
if (providerBizListener != null) {
@@ -113,6 +139,11 @@ public class AdasEventManager implements
}
}
@Override
public void onAutopilotGuardian(AutopilotGuardianInfo guardianInfo) {
}
@Override
public void onWebSocketConnectSuccess() {
Logger.d(TAG, "webSocket 连接成功");

20
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java
View File

@@ -4,6 +4,17 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage;
import com.mogo.module.adas.entity.WarnMessageModel;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel;
import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarRectModel;
import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarStateModel;
import com.zhidao.support.adas.high.bean.AutopilotRoute;
import com.zhidao.support.adas.high.bean.AutopilotStatus;
import com.zhidao.support.adas.high.bean.RectInfo;
import com.zhidao.support.adas.high.bean.TrajectoryInfo;
import com.zhidao.support.adas.high.bean.WarnMessageInfo;
import java.util.List;
public interface IAdasDataListener {
@@ -50,4 +61,13 @@ public interface IAdasDataListener {
default void notifyAutopilotState(AutopilotStatusInfo autopilotStatus) {
}
/**
* 车前引导路径回调
* @param trajectory
*/
default void onAutopilotTrajectory(List<TrajectoryInfo> trajectory) {
}
}