diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java index 283bc5baed..ab653f43cc 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java @@ -48,7 +48,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp @Override public void init(V2XMessageEntity v2XMessageEntity) { try { - V2XBizTrace.Companion.onAck("v2XMessageEntity",GsonUtil.jsonFromObject(v2XMessageEntity)); + V2XBizTrace.Companion.onAck("v2XMessageEntity",v2XMessageEntity); V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent(); if (v2XRoadEventEntity != null) { if (!isSameScenario(v2XMessageEntity)) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt index 483e2a083c..5f9bff95c3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt @@ -28,7 +28,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = Record(AppUtils.getAppVersionName(), sn, mac, type, isSupportPatch, time = System.currentTimeMillis()) UpgradeDbHelper.insertRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_start" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_start" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -38,7 +38,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = CheckRecord(AppUtils.getAppVersionName(), START, time = System.currentTimeMillis()) UpgradeDbHelper.insertCheckRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_request_start" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_request_start" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -48,7 +48,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = CheckRecord(AppUtils.getAppVersionName(), SUCCESS, response, time = System.currentTimeMillis()) UpgradeDbHelper.insertCheckRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_request_success" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_request_success" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -67,7 +67,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = UpgradeRecord(fromVersionName = AppUtils.getAppVersionName(), toVersionName = newVersionName, fromMd5 = AppUtils.getAppApkMd5(), toMD5 = newMd5, type = getType(type), time = System.currentTimeMillis()) UpgradeDbHelper.insertUpgradeRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_record" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_record" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -77,7 +77,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = DownloadRecord(versionName = AppUtils.getAppVersionName(), status = DownloadStart, downloadUrl = downloadUrl, time = System.currentTimeMillis()) UpgradeDbHelper.insertDownloadRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_download_start" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_download_start" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -87,7 +87,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = DownloadRecord(versionName = AppUtils.getAppVersionName(), status = DownloadPause, downloadUrl = downloadUrl, time = System.currentTimeMillis()) UpgradeDbHelper.insertDownloadRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_download_pause" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_download_pause" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -97,7 +97,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = DownloadRecord(versionName = AppUtils.getAppVersionName(), status = DownloadFailed, failReason = error, downloadUrl = downloadUrl, time = System.currentTimeMillis()) UpgradeDbHelper.insertDownloadRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_download_failed" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_download_failed" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -107,7 +107,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = DownloadRecord(versionName = AppUtils.getAppVersionName(), status = DownloadComplete, downloadUrl = downloadUrl, time = System.currentTimeMillis()) UpgradeDbHelper.insertDownloadRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_download_success" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_download_success" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -117,7 +117,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = InstallStart, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_install_start" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_install_start" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -127,7 +127,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = SourceMd5CheckStart, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_check_source_md5_start" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_check_source_md5_start" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -137,7 +137,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = SourceMd5CheckFailed, failReason = error, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_check_source_md5_failed" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_check_source_md5_failed" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -147,7 +147,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = SourceMd5CheckSuccess, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_check_source_md5_success" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_check_source_md5_success" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -157,7 +157,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = ApplyPatchStart, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_apply_patch_start" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_apply_patch_start" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -167,7 +167,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = ApplyPatchFailed, failReason = error, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_apply_patch_failed" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_apply_patch_failed" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -177,7 +177,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = ApplyPatchSuccess, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_apply_patch_success" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_apply_patch_success" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -187,7 +187,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = TargetMd5CheckStart, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_check_target_md5_start" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_check_target_md5_start" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -197,7 +197,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = TargetMd5CheckFailed, failReason = error, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_check_target_md5_failed" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_check_target_md5_failed" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -207,7 +207,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = TargetMd5CheckSuccess, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_check_target_md5_success" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_check_target_md5_success" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -217,7 +217,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { val record = InstallRecord(version = AppUtils.getAppVersionName(), status = InstallFailed, code = code, failReason = error, time = System.currentTimeMillis()) UpgradeDbHelper.insertInstallRecord(record) try { - onUpgradeRecordLinkLog(mapOf("upgrade_install_failed" to GsonUtils.toJson(record))) + onUpgradeRecordLinkLog(mapOf("upgrade_install_failed" to record)) } catch (t: Throwable) { t.printStackTrace() } @@ -249,7 +249,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { itx["step_3"] = all.downloads?.sortedBy { it.status.ordinal }?.mapIndexed { index, r -> "$index" to GsonUtils.toJson(r) } ?: emptyList() itx["step_4"] = all.installs?.let { ArrayList(it) + InstallRecord(success.versionName, InstallSuccess, 0) }?.sortedBy { it.status.ordinal }?.mapIndexed { index, r -> "$index" to GsonUtils.toJson(r) } ?: emptyList() try { - onUpgradeRecordLinkLog(mapOf("upgrade_success" to GsonUtils.toJson(all))) + onUpgradeRecordLinkLog(mapOf("upgrade_success" to all)) } catch (t: Throwable) { t.printStackTrace() } @@ -265,7 +265,7 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { itx["step_3"] = all.downloads?.sortedBy { it.status.ordinal }?.mapIndexed { index, r -> "$index" to GsonUtils.toJson(r) } ?: emptyList() itx["step_4"] = all.installs?.sortedBy { it.status.ordinal }?.mapIndexed { index, r -> "$index" to GsonUtils.toJson(r) } ?: emptyList() try { - onUpgradeRecordLinkLog(mapOf("upgrade_failed" to GsonUtils.toJson(all))) + onUpgradeRecordLinkLog(mapOf("upgrade_failed" to all)) } catch (t: Throwable) { t.printStackTrace() } @@ -301,5 +301,5 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { nodeAliasCode = ChainConstant.CHAIN_CODE_UPGRADE_APP, paramIndexes = [0] ) - private fun onUpgradeRecordLinkLog(extra: Map) {} + private fun onUpgradeRecordLinkLog(extra: Map) {} } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 79881fcaf7..f737add6d8 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -34,7 +34,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.updateLongSightLevel import com.mogo.eagle.core.function.utils.MapBizTrace import com.mogo.eagle.core.function.utils.MapBizTrace.Companion.getCurrentCNode -import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.map.MogoMapUIController import com.mogo.map.uicontroller.VisualAngleMode @@ -73,30 +72,27 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, if (it.what == H_ERROR_CLOUD) { if (!aiCloudDataChange.get()) { MapBizTrace.log( - CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_CLOUD_ERROR, TAG, GsonUtils.toJson( - mutableMapOf( - "msg" to "云端 $H_DELAY_TIME 秒内无感知数据下发", - "socketStatus" to MogoStatusManager.getInstance().isSocketOnLine, - "cityCode" to CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode - ) + CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_CLOUD_ERROR, TAG, + mutableMapOf( + "msg" to "云端 $H_DELAY_TIME 秒内无感知数据下发", + "socketStatus" to MogoStatusManager.getInstance().isSocketOnLine, + "cityCode" to CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode ) ) } else { MapBizTrace.log( - CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_CLOUD_PUSH, TAG, GsonUtils.toJson( - mutableMapOf( - "msg" to "延迟 $H_DELAY_TIME 秒内获取云端下发感知数据大小", - "cloudDataSize" to cloudDataSize - ) + CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_CLOUD_PUSH, TAG, + mutableMapOf( + "msg" to "延迟 $H_DELAY_TIME 秒内获取云端下发感知数据大小", + "cloudDataSize" to cloudDataSize ) ) } } if (it.what == H_ERROR_MAP) { MapBizTrace.log( - CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_MAP_ERROR, TAG, GsonUtils.toJson( - mutableMapOf("msg" to "地图漫游模式启动失败,原因:${it.obj}") - ) + CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_MAP_ERROR, TAG, + mutableMapOf("msg" to "地图漫游模式启动失败,原因:${it.obj}") ) if (DebugConfig.isDebug()) { ToastUtils.showShort("进入漫游模式失败, code:${it.obj}") @@ -153,7 +149,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, "", CHAIN_CODE_ROMA_CLICK, TAG, - GsonUtils.toJson(mutableMapOf("trigger" to true)) + mutableMapOf("trigger" to true) ) openRoma() } else { @@ -186,15 +182,13 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, // false，改变父节点信息 MapBizTrace.log( if (dataReceive) CHAIN_CODE_ROMA_CLICK else "", CHAIN_CODE_ROMA_REQUEST, TAG, - GsonUtils.toJson( - mutableMapOf( - "dataReceive" to dataReceive, - "lon" to gnss.longitude, - "lat" to gnss.latitude, - "heading" to gnss.heading, - "socketStatus" to MogoStatusManager.getInstance().isSocketOnLine, - "cityCode" to CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode - ) + mutableMapOf( + "dataReceive" to dataReceive, + "lon" to gnss.longitude, + "lat" to gnss.latitude, + "heading" to gnss.heading, + "socketStatus" to MogoStatusManager.getInstance().isSocketOnLine, + "cityCode" to CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode ), !dataReceive ) aiCloudIdentifyNetWorkModel.requestIdentifyRange( @@ -207,12 +201,10 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, if (dataReceive) CHAIN_CODE_ROMA_REQUEST else "", CHAIN_CODE_ROMA_REQUEST_OK, TAG, - GsonUtils.toJson( - mutableMapOf( - "dataResult" to dataReceive, - "startRange" to START_METRE, - "endRange" to END_METRE, - ) + mutableMapOf( + "dataResult" to dataReceive, + "startRange" to START_METRE, + "endRange" to END_METRE, ), !dataReceive ) if (dataReceive) { @@ -226,13 +218,11 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, if (dataReceive) CHAIN_CODE_ROMA_REQUEST else "", CHAIN_CODE_ROMA_REQUEST_ERROR, TAG, - GsonUtils.toJson( - mutableMapOf( - "errorMsg" to errorMsg, - "dataResult" to dataReceive, - "startRange" to START_METRE, - "endRange" to END_METRE - ) + mutableMapOf( + "errorMsg" to errorMsg, + "dataResult" to dataReceive, + "startRange" to START_METRE, + "endRange" to END_METRE ), true ) updateLongSightLevel(false) @@ -252,7 +242,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, CHAIN_CODE_ROMA_REQUEST_OK, CHAIN_CODE_ROMA_MAP_START, TAG, - GsonUtils.toJson(mutableMapOf("romaStart" to "地图开始漫游")) + mutableMapOf("romaStart" to "地图开始漫游") ) showAiCloud.set(true) FunctionBuildConfig.isDrawIdentifyData = false @@ -270,9 +260,8 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, } 2 -> { // 地图自动漫游结束，重置状态，调用close通知服务端 MapBizTrace.log( - CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_MAP_END, TAG, GsonUtils.toJson( - mutableMapOf("romaEnd" to "地图结束回调，状态：$status") - ), true + CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_MAP_END, TAG, + mutableMapOf("romaEnd" to "地图结束回调，状态：$status"), true ) reset() } @@ -280,11 +269,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, MapBizTrace.log( CHAIN_CODE_ROMA_CLOSE_CLICK, CHAIN_CODE_ROMA_MAP_CHANGE_END, - TAG, - GsonUtils.toJson( - mutableMapOf("romaEnd" to "地图结束回调，状态：$status") - ), - true + TAG, mutableMapOf("romaEnd" to "地图结束回调，状态：$status"), true ) reset(false) } 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 786ecfd526..949a5d03b2 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 @@ -371,12 +371,12 @@ class HttpDnsStartUp : AndroidStartup() { nodeAliasCode = CHAIN_CODE_HTTP_DNS_ERROR_REASON, paramIndexes = [0] ) - private fun logError(pr: String) { + private fun logError(pr: Map) { CallerLogger.e("$M_MAIN$TAG", "pr:$pr") } // 归一处理 - private fun getPrReason(msg: String): String { + private fun getPrReason(msg: String): Map { val map = hashMapOf() map["lat"] = if (CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().latitude != 0.0) @@ -387,7 +387,7 @@ class HttpDnsStartUp : AndroidStartup() { CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().longitude else CallerMapUIServiceManager.getGDLocationServer(context!!)!!.lastLon map["reason"] = msg - return GsonUtils.toJson(map) + return map } @ChainLog(