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

Merge branch 'dev_sweeper-d_230423_3.1.0' of http://gitlab.zhidaoauto.com/SCA/L4HA/AndroidApp/MoGoEagleEye into dev_sweeper-d_230423_3.1.0

Browse Source
This commit is contained in:
bxb
2023-05-24 16:35:26 +08:00
parent ede35f09ec e86d6a32ee
commit f570f8349a
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task.proto
View File

@@ -54,6 +54,7 @@ message TaskInfo {
uint64 taskEndTime = 5; //任务预计结束时间 时间戳
uint64 currentTime = 6; //当前时间戳
repeated SubTaskInfo subList = 7; // 子任务列表信息
bool isPop = 8; // 是否弹窗
}
//1.2、响应信息

1
libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_confirm.proto
View File

@@ -12,6 +12,7 @@ message TaskConfirm {
string sn = 1;// sn
string taskId = 2;// 大任务编号
string subTaskId = 3;// 子任务编号
bool isPop = 4; // 是否弹窗
}
//2.2、响应信息

1
libraries/mogo-adas-data/src/main/proto/sweeper/sweeper_task_stop.proto
View File

@@ -22,6 +22,7 @@ message StopTaskReq {
string sn = 1;// sn
string taskId = 2;// 大任务ID
StopTaskType type = 3; //任务结束类型
bool isPop = 4; // 是否弹窗
}
//4.2、响应信息

4
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/M1StitchedVideoMessage.java
View File

@@ -21,13 +21,13 @@ public class M1StitchedVideoMessage extends MyAbstractMessageHandler {
int len = raw.getPackageLengthValue() - raw.getOffsetValue();
byte[] data = new byte[len];
System.arraycopy(raw.originalData.toByteArray(), raw.getOffsetValue(), data, 0, len);
AdasChannel.calculateTimeConsumingOnDispatchRaw("M1StitchedVideoMessage", raw.receiveTime);
AdasChannel.calculateTimeConsumingOnDispatchRaw("M1拼接视频", raw.receiveTime);
long nowTime = 0;
if (CupidLogUtils.isEnableLog())
nowTime = SystemClock.elapsedRealtime();
if (adasListener != null) {
adasListener.onM1StitchedVideo(raw.getHeader(), data);
}
AdasChannel.calculateTimeConsumingBusiness("M1StitchedVideoMessage", nowTime);
AdasChannel.calculateTimeConsumingBusiness("M1拼接视频", nowTime);
}
}

10
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/subscribe/SubscribeInterface.java
View File

@@ -138,9 +138,13 @@ public class SubscribeInterface {
MessageType[] types = MessageType.values();
if (types.length > 0) {
for (MessageType messageType : types) {
//连接成功后只有M1拼接视频接收接口默认不进行订阅，其他接收接口默认自动订阅
if (messageType != MessageType.TYPE_RECEIVE_M1_STITCHED_VIDEO && messageType.name().toLowerCase().contains("type_receive")) {
subscribedInterface.put(messageType, messageType.typeCode.getNumber());
if (messageType.name().toLowerCase().contains("type_receive")) {
//连接成功后只有M1拼接视频接收接口默认不进行订阅，其他接收接口默认自动订阅
if (messageType == MessageType.TYPE_RECEIVE_M1_STITCHED_VIDEO) {
unsubscribedInterface.put(messageType, messageType.typeCode.getNumber());
} else {
subscribedInterface.put(messageType, messageType.typeCode.getNumber());
}
}
}
}