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

[Change]

Browse Source 
暂时关闭全链路统计日志，因为影响到了ADAS感知绘制

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-02-22 17:31:51 +08:00
parent d19b699507
commit 0ebbc5760f
5 changed files with 92 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
View File

@@ -66,7 +66,11 @@ class MoGoAutopilotProvider :
// 注册地图采集功能
CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this)
// "192.168.1.102"
val options = AdasOptions.Builder().setClient(false).build()
val options = AdasOptions.Builder()
.setIPCIp(FunctionBuildConfig.adasConnectIP)
.setClient(false)
.build()
AdasManager.getInstance().create(context, options)
NSDNettyManager.getInstance().startNSDNettyServer(context, object : NettyServerListener<MogoProtocolMsg> {
override fun onMessageResponseServer(msg: MogoProtocolMsg?, channel: Channel?) {
@@ -100,7 +104,10 @@ class MoGoAutopilotProvider :
//FunctionBuildConfig.isDemoMode = true
//FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
// "192.168.1.102"
val options = AdasOptions.Builder().build()
val options = AdasOptions
.Builder()
.setIPCIp(FunctionBuildConfig.adasConnectIP)
.build()
AdasManager.getInstance().create(context, options)
NSDNettyManager.getInstance().searchAndConnectServer(context, MoGoAiCloudClientConfig.getInstance().sn, object : NettyClientListener<MogoProtocolMsg> {
override fun onMessageResponseClient(msg: MogoProtocolMsg?, sign: String?) {
@@ -126,7 +133,10 @@ class MoGoAutopilotProvider :
//
else -> // 默认采用UDP寻址方式
{
val options = AdasOptions.Builder().setClient(false).build()
val options = AdasOptions.Builder()
.setClient(false)
.setIPCIp(FunctionBuildConfig.adasConnectIP)
.build()
AdasManager.getInstance().create(context, options)
}
}

96
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java
View File

@@ -71,12 +71,12 @@ import java.util.List;
public class MoGoAdasListenerImpl implements OnAdasListener {
private final String TAG = "OnAdasListenerAdapter";
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void onRectData(RectInfo rectInfo) {
if (HdMapBuildConfig.isMapLoaded) {
@@ -85,12 +85,12 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
}
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void onCarStateData(CarStateInfo carStateInfo) {
if (HdMapBuildConfig.isMapLoaded) {
@@ -170,12 +170,12 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
}
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void autopilotStatus(AutopilotStatus autopilotStatus) {
if (HdMapBuildConfig.isMapLoaded) {
@@ -208,12 +208,12 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
}
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void autopilotArrive(AutopilotWayArrive autopilotWayArrive) {
if (HdMapBuildConfig.isMapLoaded) {
@@ -232,12 +232,12 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
}
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void onAutopilotRoute(AutopilotRoute route) {
if (HdMapBuildConfig.isMapLoaded) {
@@ -282,12 +282,12 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutopilotSNRequest();
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void onAutopilotGuardian(AutopilotGuardianInfo guardianInfo) {
if (HdMapBuildConfig.isMapLoaded) {
@@ -296,12 +296,12 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
}
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void onAutopilotRecord(AutopilotRecordResult result) {
if (result != null) {
@@ -336,12 +336,12 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN,
// paramIndexes = {0},
// clientPkFileName = "sn")
@Override
public void onWarnMessage(WarnMessageInfo warnMessageInfo) {
final AutopilotWarnMessage warnMessage = AdasObjectConvertUtils.INSTANCE.fromAdasObject(warnMessageInfo);

12
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -186,12 +186,12 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
}
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_UDP_CONNECT_ADDRESS,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_UDP_CONNECT_ADDRESS,
// paramIndexes = {0},
// clientPkFileName = "sn")
private void connectSocket(String address) {
if (mSocket != null)
mSocket.connectWebSocket(address);

38
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java
View File

@@ -259,12 +259,12 @@ public class FpgaSocket implements IWebSocket {
public class EchoWebSocketListener extends WebSocketListener {
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN,
paramIndexes = {1},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN,
// paramIndexes = {1},
// clientPkFileName = "sn")
@Override
public void onOpen(WebSocket webSocket, Response response) {
super.onOpen(webSocket, response);
@@ -273,12 +273,12 @@ public class FpgaSocket implements IWebSocket {
mWebSocketConnectListener.onWebSocketConnectSuccess(webSocket);
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON,
paramIndexes = {1},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON,
// paramIndexes = {1},
// clientPkFileName = "sn")
@Override
public void onMessage(WebSocket webSocket, String text) {
super.onMessage(webSocket, text);
@@ -292,13 +292,13 @@ public class FpgaSocket implements IWebSocket {
mWebSocketConnectListener.onMessage(text);
}
}
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE,
paramIndexes = {-1},
clientPkFileName = "sn")
//
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE,
// paramIndexes = {-1},
// clientPkFileName = "sn")
@Override
public void onMessage(WebSocket webSocket, ByteString bytes) {
super.onMessage(webSocket, bytes);

12
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/udp/CupidUdpConstract.java
View File

@@ -71,12 +71,12 @@ public class CupidUdpConstract {
/**
* 开启线程 在surface准备好之后再进行接收数据
*/
@ChainLog(linkCode = CHAIN_LINK_ADAS,
linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_UDP_INIT,
paramIndexes = {0},
clientPkFileName = "sn")
// @ChainLog(linkCode = CHAIN_LINK_ADAS,
// linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
// endpoint = TracingConstants.Endpoint.PAD,
// nodeAliasCode = CHAIN_ALIAS_CODE_UDP_INIT,
// paramIndexes = {0},
// clientPkFileName = "sn")
public void startReceiverDataThread() {
if (udpReceiverDataThread != null) {
udpReceiverDataThread.interrupt();