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

[600][adas]添加融合模式开关；添加盲区开关；添加批量查询或单个查询接口；添加命令批量下发接口；setParam V1和V2接口兼容，支持混合调用和查询；

Browse Source
This commit is contained in:
xinfengkun
2023-08-16 16:47:55 +08:00
parent 8cbce5bb14
commit 71b23bb983
10 changed files with 424 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
libraries/mogo-adas-data/src/main/java/com/zhjt/mogo/adas/data/bean/AdasParam.java
View File

@@ -70,6 +70,26 @@ public class AdasParam {
* -1：未知 0：关闭故障减速停车策略 1（默认）：使用故障减速停车策略
*/
public final int breakdownSlowDown;
/**
* 盲区开关
* 0: off 1:on
*/
public final int blindArea;
/**
* 融合v2n开关
* 0:不发给PnC 1:发给Pnc
*/
public final int v2nToPnc;
/**
* 融合v2i开关
* 0:不发给PnC和鹰眼 1:发给Pnc和鹰眼，默认0
*/
public final int v2iToPnc;
/**
* 融合模式
* 1:全融合模式 2:盲区模式 3:超视距模式 4:透传模式 5:纯路侧模式，默认1
*/
public final int fusionMode;
public AdasParam(MessagePad.SetParamReq param) {
int detouringCmd = -1;
@@ -83,6 +103,11 @@ public class AdasParam {
String m1StitchedVideoSelfVehicleParam = null;
M1StitchedVideoSelfVehicleParam m1StitchedVideoSelfVehicleParamParse = null;
int breakdownSlowDown = -1;
int blindArea = -1;
int v2nToPnc = -1;
int v2iToPnc = -1;
int fusionMode = -1;
if (param != null) {
int size = param.getReqsCount();
if (size > 0) {
@@ -137,6 +162,22 @@ public class AdasParam {
if (!TextUtils.isEmpty(value)) {
breakdownSlowDown = Integer.parseInt(value);
}
} else if (type == AdasConstants.MapSystemParamType.BLIND_AREA_VALUE) {
if (!TextUtils.isEmpty(value)) {
blindArea = Integer.parseInt(value);
}
} else if (type == AdasConstants.MapSystemParamType.V2N_TO_PNC_VALUE) {
if (!TextUtils.isEmpty(value)) {
v2nToPnc = Integer.parseInt(value);
}
} else if (type == AdasConstants.MapSystemParamType.V2I_TO_PNC_VALUE) {
if (!TextUtils.isEmpty(value)) {
v2iToPnc = Integer.parseInt(value);
}
} else if (type == AdasConstants.MapSystemParamType.FUSION_MODE_VALUE) {
if (!TextUtils.isEmpty(value)) {
fusionMode = Integer.parseInt(value);
}
}
}
}
@@ -152,6 +193,10 @@ public class AdasParam {
this.m1StitchedVideoSelfVehicleParam = m1StitchedVideoSelfVehicleParam;
this.m1StitchedVideoSelfVehicleParamParse = m1StitchedVideoSelfVehicleParamParse;
this.breakdownSlowDown = breakdownSlowDown;
this.blindArea = blindArea;
this.v2nToPnc = v2nToPnc;
this.v2iToPnc = v2iToPnc;
this.fusionMode = fusionMode;
}
@Override
@@ -165,7 +210,12 @@ public class AdasParam {
"\n环岛模式开关=" + (rampThetaValid == -1 ? "未知" : rampThetaValid == 0 ? "普通模式" : "环岛模式") +
"\n弱网减速停车策略开关=" + (weakNetSlowDown == -1 ? "未知" : weakNetSlowDown == 0 ? "关闭弱网减速停车策略" : "使用弱网减速停车策略") +
"\nm1拼接视频自车位置参数=" + (m1StitchedVideoSelfVehicleParam == null ? "未知" : m1StitchedVideoSelfVehicleParam) +
"\n故障减速停车策路开关=" + (breakdownSlowDown == -1 ? "未知" : breakdownSlowDown == 0 ? "关闭故障减速停车策略" : "使用故障减速停车策略");
"\n故障减速停车策路开关=" + (breakdownSlowDown == -1 ? "未知" : breakdownSlowDown == 0 ? "关闭故障减速停车策略" : "使用故障减速停车策略") +
"\n盲区开关=" + (blindArea == -1 ? "未知" : blindArea == 0 ? "关" : "开") +
"\n融合V2N开关=" + (v2nToPnc == -1 ? "未知" : v2nToPnc == 0 ? "不发给PnC" : "发给PnC") +
"\n融合V2I开关=" + (v2iToPnc == -1 ? "未知" : v2iToPnc == 0 ? "不发给PnC和鹰眼" : "发给Pnc和鹰眼") +
"\n融合模式=" + (fusionMode == -1 ? "未知" : fusionMode == 5 ? "纯路侧模式" : fusionMode == 4 ? "透传模式" : fusionMode == 3 ? "超视距模式" : fusionMode == 2 ? "盲区模式" : "全融合模式")
;
}
public static class M1StitchedVideoSelfVehicleParam {