From b76db7bc2ad9c345c25cd90fe645dcafef3f6de9 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 8 Nov 2023 10:37:04 +0800 Subject: [PATCH] [6.2.0] trace log --- .../autopilot/telematic/TeleMsgHandler.kt | 35 ++++++++++++++----- .../startup/stageone/HttpDnsStartUp.kt | 2 +- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index cbac9fcb20..11c5c832ff 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -17,7 +17,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager -import com.mogo.eagle.core.utilcode.mogo.logger.* +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils @@ -35,7 +35,7 @@ import mogo.telematics.pad.MessagePad class TeleMsgHandler : IMsgHandler { - companion object{ + companion object { private const val TAG = "TeleMsgHandler" } @@ -93,7 +93,10 @@ class TeleMsgHandler : IMsgHandler { AppConfigInfo.iPCMacAddress = carConfig.macAddress AppConfigInfo.dockerVersion = carConfig.dockVersion listener?.connectDevice(!carConfig.dockVersion.contains("2.3.0")) - CallerDevaToolsManager.getBindingCarInfo(carConfig.macAddress, MoGoAiCloudClientConfig.getInstance().sn) + CallerDevaToolsManager.getBindingCarInfo( + carConfig.macAddress, + MoGoAiCloudClientConfig.getInstance().sn + ) invokeNettyConnResult( "司机屏发送给乘客屏配置信息为:${ TextFormat.printer().escapingNonAscii(false).printToString(carConfig) @@ -130,11 +133,19 @@ class TeleMsgHandler : IMsgHandler { } } TelematicConstant.BUSINESS_STRING -> { - CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.BUSINESS_STRING, it.body) + CallerTelematicListenerManager.invokeReceivedMsg( + TelematicConstant.BUSINESS_STRING, + it.body + ) } TelematicConstant.SHOW_TRAFFIC_LIGHT -> { val trafficLightJson = String(it.body) - CallerTrafficLightListenerManager.invokeTrafficLightStatus(GsonUtils.fromJson(trafficLightJson, TrafficLightResult::class.java)) + CallerTrafficLightListenerManager.invokeTrafficLightStatus( + GsonUtils.fromJson( + trafficLightJson, + TrafficLightResult::class.java + ) + ) } TelematicConstant.HIDE_TRAFFIC_LIGHT -> { ThreadUtils.runOnUiThread { @@ -143,7 +154,10 @@ class TeleMsgHandler : IMsgHandler { } TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR -> { ThreadUtils.runOnUiThread { - CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR,it.body) + CallerTelematicListenerManager.invokeReceivedMsg( + TelematicConstant.CONTROL_PASSENGER_DRIVER_MONITOR, + it.body + ) } } @@ -206,14 +220,17 @@ class TeleMsgHandler : IMsgHandler { NSDNettyManager.getInstance().sendMsgToSpecifiedClient( MogoProtocolMsg(10, snArray.size, snArray), channel ) { future -> - invokeReqStatusLog(mapOf("dSendSN(${sn})2P" to future.isSuccess)) + invokeReqStatusLog(mapOf("dSendSN2P" to future.isSuccess, "sn" to sn)) } } else { invokeNettyConnResult("司机屏SN未获取到，不发送给乘客屏") } } TelematicConstant.BUSINESS_STRING -> { - CallerTelematicListenerManager.invokeReceivedMsg(TelematicConstant.BUSINESS_STRING, it.body) + CallerTelematicListenerManager.invokeReceivedMsg( + TelematicConstant.BUSINESS_STRING, + it.body + ) } else -> { } @@ -295,7 +312,7 @@ class TeleMsgHandler : IMsgHandler { nodeAliasCode = ChainConstant.CHAIN_CODE_MULTI_CONNECT, paramIndexes = [0] ) - private fun invokeReqStatusLog(param:Map){ + private fun invokeReqStatusLog(param: Map) { CallerLogger.d("${SceneConstant.M_D_C}$TAG", param.toString()) } diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index dec67b7966..dc23edb3eb 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -356,7 +356,7 @@ class HttpDnsStartUp : AndroidStartup() { } override fun onError(code: String, msg: String?) { - CallerLogger.d("$M_MAIN$TAG", "socket-onError code : $code , msg : $msg") + logError(getPrReason("socket-onError code : $code , msg : $msg")) } }) // 开启Socket长链服务