From 74824c1eba1c44f802d12fba09ea6b68bfe44b97 Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 3 Jan 2024 19:35:08 +0800 Subject: [PATCH] =?UTF-8?q?[v6.2.6/5.2.6]Bus=E5=85=AC=E4=BA=A4/=E6=8E=A5?= =?UTF-8?q?=E9=A9=B3/=E5=8C=85=E8=BD=A6=EF=BC=9A=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=9F=8B=E7=82=B9=E5=A2=9E=E5=8A=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=88=E8=87=AA=E9=A9=BE=E7=8A=B6=E6=80=81=E3=80=81?= =?UTF-8?q?=E5=9F=9F=E6=8E=A7=E5=8E=9F=E5=A7=8B=E4=BF=A1=E6=81=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/constant/BusConst.kt | 2 ++ .../main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt | 7 +++++++ .../com/magic/mogo/och/charter/constant/CharterConst.kt | 2 ++ .../mogo/och/charter/manager/CharterAnalyticsManager.java | 6 ++++++ .../src/main/java/com/mogo/och/bus/constant/BusConst.kt | 2 ++ .../java/com/mogo/och/bus/util/BusAnalyticsManager.java | 6 ++++++ 6 files changed, 25 insertions(+) diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt index 711fe90a39..84ea0cf753 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt @@ -47,6 +47,8 @@ class BusConst { const val EVENT_PARAM_START_NAME = "start_name" const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_LINE_ID = "line_id" + const val EVENT_PARAM_MAP_ORIGINAL_DATA = "map_original_data" // 域控原始状态信息 + const val EVENT_PARAM_AUTOPILOT_STATE = "autopilot_state" //原始的自动驾驶状态 const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt index d43c83be61..28aa596788 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.kt @@ -11,6 +11,7 @@ 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.DateTimeUtils import com.mogo.och.bus.constant.BusConst +import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.RxUtils import io.reactivex.disposables.Disposable @@ -42,8 +43,14 @@ object BusAnalyticsManager { mStartAutopilotParams[BusConst.EVENT_PARAM_START_FAILURE_CODE] = failCode mStartAutopilotParams[BusConst.EVENT_PARAM_START_FAILURE_MSG] = failMsg } + + mStartAutopilotParams[BusConst.EVENT_PARAM_MAP_ORIGINAL_DATA] = + OCHAdasAbilityManager.getInstance().originalData + mStartAutopilotParams[BusConst.EVENT_PARAM_AUTOPILOT_STATE] = + CallerAutoPilotStatusListenerManager.getState() mStartAutopilotParams[BusConst.EVENT_PARAM_START_RESULT] = CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING + MogoAnalyticUtils.track(mStartAutopilotKey, mStartAutopilotParams) clearStartAutopilotParams() //清空参数数据，防止误传 } diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt index 09cabd4b95..ea0f7f3ac4 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt @@ -30,6 +30,8 @@ class CharterConst { const val EVENT_PARAM_START_NAME = "start_name" const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_LINE_ID = "line_id" + const val EVENT_PARAM_MAP_ORIGINAL_DATA = "map_original_data" // 域控原始状态信息 + const val EVENT_PARAM_AUTOPILOT_STATE = "autopilot_state" //原始的自动驾驶状态 const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java index d8f40dd0c7..bc6b1289f8 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java @@ -14,6 +14,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; +import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager; import java.util.HashMap; @@ -54,6 +55,11 @@ public class CharterAnalyticsManager { mStartAutopilotParams.put(CharterConst.EVENT_PARAM_START_FAILURE_CODE, failCode); mStartAutopilotParams.put(CharterConst.EVENT_PARAM_START_FAILURE_MSG, failMsg); } + + mStartAutopilotParams.put(CharterConst.EVENT_PARAM_MAP_ORIGINAL_DATA, + OCHAdasAbilityManager.getInstance().getOriginalData()); + mStartAutopilotParams.put(CharterConst.EVENT_PARAM_AUTOPILOT_STATE, + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); mStartAutopilotParams.put(CharterConst.EVENT_PARAM_START_RESULT , CallerAutoPilotStatusListenerManager.INSTANCE.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt index 7eadb3d41f..d62d02cebe 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt @@ -47,6 +47,8 @@ class BusConst { const val EVENT_PARAM_START_NAME = "start_name" const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_LINE_ID = "line_id" + const val EVENT_PARAM_MAP_ORIGINAL_DATA = "map_original_data" // 域控原始状态信息 + const val EVENT_PARAM_AUTOPILOT_STATE = "autopilot_state" //原始的自动驾驶状态 const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java index 3bbb0f8154..27009e156f 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java @@ -14,6 +14,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.och.bus.constant.BusConst; +import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager; import java.util.HashMap; @@ -55,6 +56,11 @@ public class BusAnalyticsManager { mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_FAILURE_CODE, failCode); mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_FAILURE_MSG, failMsg); } + + mStartAutopilotParams.put(BusConst.EVENT_PARAM_MAP_ORIGINAL_DATA, + OCHAdasAbilityManager.getInstance().getOriginalData()); + mStartAutopilotParams.put(BusConst.EVENT_PARAM_AUTOPILOT_STATE, + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_RESULT , CallerAutoPilotStatusListenerManager.INSTANCE.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);