From acd15af0fae7c5714ddf873a0753a08ae10d1bfa Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 4 Dec 2024 11:46:19 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fea]=20[=E6=B7=BB=E5=8A=A0=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=8F=82=E6=95=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/manager/autopilot/line/LineManager.kt | 8 ++++++-- .../logchainanalytic/OchChainLogManager.kt | 6 ++++++ .../java/com/mogo/och/weaknet/model/LineModel.kt | 4 ++-- .../com/mogo/commons/utils/MogoAnalyticUtils.kt | 16 ++++++++++++++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt index 721d21dc72..634d2f258f 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt @@ -84,9 +84,13 @@ object LineManager : CallerBase() { if(!AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)&&!AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){ val (start, end) = getStations() if(start!=null&&end!=null){ - CallerDataCenterBizListener.invokeOchInfo(OchInfo(0, mutableListOf(start.toMogoLocation(),end.toMogoLocation()))) + val ochInfo = OchInfo(0, mutableListOf(start.toMogoLocation(), end.toMogoLocation())) + CallerDataCenterBizListener.invokeOchInfo(ochInfo) + OchChainLogManager.writeChainLogMap("向地图传参数", "参数信息:${ochInfo}") }else{ - CallerDataCenterBizListener.invokeOchInfo(OchInfo(0, mutableListOf())) + val ochInfo = OchInfo(0, mutableListOf()) + CallerDataCenterBizListener.invokeOchInfo(ochInfo) + OchChainLogManager.writeChainLogMap("向地图传参数", "参数信息:${ochInfo}") } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt index 164bc09204..c20378752b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt @@ -62,6 +62,12 @@ object OchChainLogManager { const val EVENT_KEY_INFO_BLUETOOTH = "analytics_event_och_bluetooth" + const val EVENT_KEY_INFO_MAP = "analytics_event_och_map" + + + fun writeChainLogMap(title: String, info: String) { + writeChainLog(title, info, true, EVENT_KEY_INFO_MAP) + } fun writeChainLogDb(title: String, info: String) { writeChainLog(title, info, true, EVENT_KEY_INFO_DB) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 023aae7da9..7c50279532 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -435,8 +435,8 @@ object LineModel { if(stationList.isNullOrEmpty()){ val ochInfo = OchInfo(1, mutableListOf()) ochInfo.siteMarkerList = mutableListOf() - OchChainLogManager.writeChainLog("地图","站点信息:${ochInfo}") CallerDataCenterBizListener.invokeOchInfo(ochInfo) + OchChainLogManager.writeChainLogMap("地图","站点信息:${ochInfo}") }else{ val siteList = mutableListOf() var temp: SiteMarkerBean?=null @@ -468,8 +468,8 @@ object LineModel { if(start!=null&&end!=null){ val ochInfo = OchInfo(1, mutableListOf(start.toMogoLocation(),end.toMogoLocation())) ochInfo.siteMarkerList = siteList - OchChainLogManager.writeChainLog("地图","站点信息:${ochInfo}") CallerDataCenterBizListener.invokeOchInfo(ochInfo) + OchChainLogManager.writeChainLogMap("地图","站点信息:${ochInfo}") } } } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt index a995c32b6f..620ba168e8 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt @@ -110,7 +110,13 @@ object MogoAnalyticUtils { e.printStackTrace() properties["network_type"] = "获取设备网络状态错误" } - Analytics.getInstance().track(event, properties) + if(ThreadUtils.isMainThread()){ + ThreadUtils.getIoPool().submit{ + Analytics.getInstance().track(event, properties) + } + }else{ + Analytics.getInstance().track(event, properties) + } } /** @@ -120,7 +126,13 @@ object MogoAnalyticUtils { * @param properties json事件参数 */ fun track(event: String?, properties: JSONObject) { - Analytics.getInstance().track(event, properties) + if(ThreadUtils.isMainThread()){ + ThreadUtils.getIoPool().submit{ + Analytics.getInstance().track(event, properties) + } + }else{ + Analytics.getInstance().track(event, properties) + } }