diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java index 32ad3ca42c..d74810508a 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java @@ -10,6 +10,7 @@ import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE; import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA; import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_ADAS; +import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA; import android.util.Log; @@ -71,6 +72,7 @@ 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}, @@ -84,6 +86,7 @@ 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}, @@ -168,6 +171,7 @@ 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}, @@ -205,6 +209,7 @@ 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}, @@ -228,6 +233,7 @@ 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}, @@ -277,6 +283,7 @@ 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_GUARDIAN, paramIndexes = {0}, @@ -290,6 +297,7 @@ 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}, @@ -329,6 +337,7 @@ 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}, diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index f909f820b5..56c8d2e062 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -48,6 +48,7 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.mogologlib + implementation rootProject.ext.dependencies.mogochainbase if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogoserviceapi diff --git a/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml index 4ba99103af..7a02e164bc 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/AndroidManifest.xml @@ -1,4 +1,7 @@ + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index b8ddf3e5f4..46d0939611 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -1,19 +1,35 @@ package com.zhjt.mogo_core_function_devatools +import android.annotation.SuppressLint import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_ADAS_INIT +import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_ADAS_MSG +import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS +import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA +import com.mogo.eagle.core.data.chain.ChainLogParam import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider +import com.mogo.eagle.core.utilcode.util.DeviceUtils +import com.mogo.eagle.core.utilcode.util.Utils +import com.zhidao.loglib.fw.FileWriteManager +import com.zhidao.loglib.fw.FwBuild import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager +import com.zhjt.service.chain.core.ChainTraceStarter @Route(path = MogoServicePaths.PATH_DEVA_TOOLS) class DevaToolsProvider : IDevaToolsProvider { + private val traceInfoCache = hashMapOf() + private val fwBuildMap: MutableMap = HashMap() + override val functionName: String get() = "DevaToolsProvider" override fun init(context: Context) { MogoLogCatchManager.init(context) + initTrace(context) } override fun startLogCatch() { @@ -24,6 +40,38 @@ class DevaToolsProvider : IDevaToolsProvider { MogoLogCatchManager.stopCatchLog() } + private fun initTrace(context: Context) { + // 初始化Trace抓取服务 + val pkgName = Utils.getApp().packageName + ChainTraceStarter.start(pkgName, DeviceUtils.getMacAddress()) + + // Trace过程中进行日志抓取，对日志进行配置 + fwBuildMap[CHAIN_LINK_LOG_CONNECT_STATUS] = + FwBuild(true, pkgName + CHAIN_LINK_LOG_ADAS_INIT, 5_000) + fwBuildMap[CHAIN_LINK_LOG_WEB_SOCKET_DATA] = + FwBuild(false, pkgName + CHAIN_LINK_LOG_ADAS_MSG, 500) + + traceInfoCache[CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true,"IPC连接状态") + traceInfoCache[CHAIN_LINK_LOG_WEB_SOCKET_DATA] = ChainLogParam(false,"IPC长链数据") + FileWriteManager.getInstance() + .init(context, MoGoAiCloudClientConfig.getInstance().sn, pkgName, fwBuildMap) + } + + override fun getTraceInfo(): HashMap { + return traceInfoCache + } + + @SuppressLint("NewApi") + override fun refreshTraceInfo(map: HashMap) { + map.forEach { (type, param) -> + val fwBuild = this.fwBuildMap[type] + fwBuild?.let { + it.isRecord = param.record + } + } + FileWriteManager.getInstance().operateChainMap(fwBuildMap) + } + override fun onDestroy() { MogoLogCatchManager.onDestroy() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index cdff9714ed..364aa33224 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -13,7 +13,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.module.common.MogoApisHandler import com.mogo.service.cloud.socket.IMogoOnMessageListener import com.zhidao.loglib.bean.RemoteLogPushContent @@ -25,7 +24,6 @@ import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companio import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.LOG_PUSH_TYPE import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.START_CATCH_LOG import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.STOP_CATCH_LOG -import java.io.File @SuppressLint("StaticFieldLeak") object MogoLogCatchManager : IMogoOnMessageListener, Handler.Callback, @@ -108,8 +106,9 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl openLoggerLevel() logInfoManager = LogInfoManagerFactory.createPushLogInfoManager( mContext, - MoGoAiCloudClientConfig.getInstance().sn + File.separator + TimeUtils.formatYMD(System.currentTimeMillis()), - content, this + MoGoAiCloudClientConfig.getInstance().sn, + content, + this ) logInfoManager?.start() logInfoManager?.registerLogOutListener { lineLog -> diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index e00bbd4713..d2035c956f 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -61,7 +61,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { return; } start = System.currentTimeMillis(); - ChainTraceStarter.start("com.mogo.launcher.f", DeviceUtils.getMacAddress()); // Crash 日志收集 initCrashConfig(); initLogConfig(); @@ -302,7 +301,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { private void initModules() { Logger.d(TAG, "initModules"); - + //mogo deva tools + MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_DEVA_TOOLS, "IMoGoDevaToolsProvider")); // 初始化 bugly 升级 MogoModulePaths.addBaseModule(new MogoModule(UpgradeReportConstants.PATH, UpgradeReportConstants.NAME)); // 初始化 apm 日志采集 @@ -312,9 +312,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule(new MogoModule(MapApiPath.PATH, "CustomMapApiBuilder")); MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY)); - // MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME)); - //mogo deva tools - MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_DEVA_TOOLS, "IMoGoDevaToolsProvider")); + // MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME)); + // 域控制器模块（新） MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AUTO_PILOT, "IMoGoAutoPilotProvider")); // OBU 模块 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/chain/ChainConstant.kt index f48d43b91f..77321383e3 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/chain/ChainConstant.kt @@ -7,6 +7,12 @@ class ChainConstant { const val CHAIN_LINK_CLOUD_SHOW = 0 const val CHAIN_LINK_ADAS = 1 + const val CHAIN_LINK_LOG_CONNECT_STATUS = 0 + const val CHAIN_LINK_LOG_WEB_SOCKET_DATA = 1 + + const val CHAIN_LINK_LOG_ADAS_INIT = "-adasInitStatus" + const val CHAIN_LINK_LOG_ADAS_MSG = "-adasWsMsg" + const val CHAIN_ALIAS_CODE_UDP_INIT = "PAD_ADAS_UDP_INIT" const val CHAIN_ALIAS_CODE_UDP_CONNECT_ADDRESS = "PAD_ADAS_UDP_CONNECT_ADDRESS" const val CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN = "PAD_ADAS_WEB_SOCKET_OPEN" diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/chain/ChainLogParam.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/chain/ChainLogParam.kt new file mode 100644 index 0000000000..a840e24497 --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/chain/ChainLogParam.kt @@ -0,0 +1,13 @@ +package com.mogo.eagle.core.data.chain + +class ChainLogParam { + + var record: Boolean = false + var des: String? = null + + constructor(record: Boolean, des: String) { + this.record = record + this.des = des + } + +} \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index f2567433fc..6e4ae1dae7 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.api.devatools +import com.mogo.eagle.core.data.chain.ChainLogParam import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider /** @@ -10,4 +11,9 @@ interface IDevaToolsProvider : IMoGoFunctionServerProvider { fun startLogCatch() fun stopLogCatch() + + fun getTraceInfo():HashMap + + fun refreshTraceInfo(map: HashMap) + } \ No newline at end of file diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/TimeUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/TimeUtils.java index b8bed29b54..67f5a97a88 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/TimeUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/TimeUtils.java @@ -55,14 +55,6 @@ public final class TimeUtils { throw new UnsupportedOperationException("u can't instantiate me..."); } - @SuppressLint("SimpleDateFormat") - public static String formatYMD(long time){ - Date date = new Date(time); - String strDateFormat = "yyyy-MM-dd"; - SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); - return sdf.format(date); - } - /** * Milliseconds to the formatted time string. *

The pattern is {@code yyyy-MM-dd HH:mm:ss}.

@@ -1532,8 +1524,8 @@ public final class TimeUtils { return CHINESE_ZODIAC[year % 12]; } - private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22}; - private static final String[] ZODIAC = { + private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22}; + private static final String[] ZODIAC = { "水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座", "狮子座", "处女座", "天秤座", "天蝎座", "射手座", "摩羯座" }; diff --git a/gradle.properties b/gradle.properties index c91b920b46..d709695d97 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,11 +56,11 @@ bytex.forbidUseLenientMutationDuringGetArtifact=true bytex.verifyProguardConfigurationChanged=false bytex.ASM_API=ASM7 -HOOK_LOG_VERSION=1.5.0 -SERVICE_CHAIN_VERSION=1.0.47 +HOOK_LOG_VERSION=1.5.15 +SERVICE_CHAIN_VERSION=1.0.52 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.1.19 +LOGLIB_VERSION=1.1.30 ######## MogoAiCloudSDK Version ######## # 网络请求 MOGO_NETWORK_VERSION=1.3.19 diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 1166bf3313..430ba74a2b 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -1,6 +1,8 @@ package com.zhidao.support.adas.high; import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_UDP_CONNECT_ADDRESS; +import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_ADAS; +import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; import static com.zhidao.support.adas.high.common.ActionTypeReceive.ACTION_WS_AUTOPILOT_CONTROL; import static com.zhidao.support.adas.high.udp.CupidUdpConstract.VIDEO_RENDER_IMAGE_UDP; @@ -184,7 +186,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec } } - @ChainLog(linkCode = 1, + @ChainLog(linkCode = CHAIN_LINK_ADAS, + linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, endpoint = TracingConstants.Endpoint.PAD, nodeAliasCode = CHAIN_ALIAS_CODE_UDP_CONNECT_ADDRESS, paramIndexes = {0}, diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java index b1f2b796e7..ee78b1d504 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java @@ -4,6 +4,8 @@ import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_WEB_ import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON; import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN; import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_ADAS; +import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; +import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA; import static com.zhidao.support.adas.high.common.Constants.WS_IP_HOST_HEAD; import static com.zhidao.support.adas.high.common.Constants.WS_PORT; @@ -84,11 +86,6 @@ public class FpgaSocket implements IWebSocket { } } - @ChainLog(linkCode = 1, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = "PAD_YINGYAN_ADAS", - paramIndexes = {0}, - clientPkFileName = "sn") @Override public void connectWebSocket(String address) { String wsHost = WS_IP_HOST_HEAD + address + WS_PORT; @@ -263,6 +260,7 @@ 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}, @@ -276,6 +274,7 @@ public class FpgaSocket implements IWebSocket { } @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}, @@ -295,9 +294,10 @@ public class FpgaSocket implements IWebSocket { } @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}, + paramIndexes = {-1}, clientPkFileName = "sn") @Override public void onMessage(WebSocket webSocket, ByteString bytes) { diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/udp/CupidUdpConstract.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/udp/CupidUdpConstract.java index 98b5164f23..6f92e2abe2 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/udp/CupidUdpConstract.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/udp/CupidUdpConstract.java @@ -3,6 +3,7 @@ package com.zhidao.support.adas.high.udp; import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_UDP_INIT; import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_ADAS; +import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhidao.support.adas.high.udp.factory.AbstractUdpImpl; @@ -22,26 +23,26 @@ public class CupidUdpConstract { /** * udp 接收数据线程 */ - private Thread udpReceiverDataThread; + private Thread udpReceiverDataThread; /** * 默认的udp端口 */ - private int defaultVideoUdpPort = 6665; + private int defaultVideoUdpPort = 6665; /** * 默认的udp端口 */ private int defaultRenderImageUdpPort = 6661; - private AbstractUdpImpl udpImpl; + private AbstractUdpImpl udpImpl; /** * 默认是0 创建h264解析流 */ - public static final int VIDEO_STREAM_UDP = 0; + public static final int VIDEO_STREAM_UDP = 0; /** * 上层绘制 待开发 */ - public static final int VIDEO_RENDER_IMAGE_UDP = 1; + public static final int VIDEO_RENDER_IMAGE_UDP = 1; public CupidUdpConstract(int udpType) { init(udpType); @@ -50,11 +51,7 @@ public class CupidUdpConstract { /** * 初始化UDPserver 接收数据 */ - @ChainLog(linkCode = CHAIN_LINK_ADAS, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_UDP_INIT, - paramIndexes = {0}, - clientPkFileName = "sn") + private void init(int udpType) { if (udpType == VIDEO_STREAM_UDP) { udpImpl = CupidUdpFactory.createVideoStreamUdp(); @@ -74,6 +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") public void startReceiverDataThread() { if (udpReceiverDataThread != null) { udpReceiverDataThread.interrupt();