From 5e20b5d74949492ee3edd9ab3204da91aae82fc2 Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 3 Jan 2024 18:25:02 +0800 Subject: [PATCH] =?UTF-8?q?[v6.2.6/5.2.6]Taxi=E7=BD=91=E7=BA=A6=E8=BD=A6/?= =?UTF-8?q?=E6=97=A0=E4=BA=BA=E8=BD=A6=EF=BC=9A=E5=90=AF=E5=8A=A8=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=9F=8B=E7=82=B9=E5=A2=9E=E5=8A=A0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=88=E8=87=AA=E9=A9=BE=E7=8A=B6=E6=80=81=E3=80=81=E5=9F=9F?= =?UTF-8?q?=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/taxi/constant/TaxiConst.kt | 2 ++ .../java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt | 7 +++++++ .../mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt | 2 ++ .../taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt | 7 +++++++ .../java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt | 2 ++ .../java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java | 5 +++++ .../mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt | 2 ++ .../taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt | 7 +++++++ 8 files changed, 34 insertions(+) diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt index 9b7e82ade1..6640864139 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt @@ -51,6 +51,8 @@ class TaxiConst { const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_LINE_ID = "line_id" const val EVENT_PARAM_ORDER_NUMBER = "order_num" + 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/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt index 0521b9a774..94f03aa857 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.kt @@ -10,6 +10,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.mogo.logger.scene.SceneConstant.Companion.M_TAXI import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.constant.TaxiConst import io.reactivex.disposables.Disposable @@ -53,8 +54,14 @@ object TaxiAnalyticsManager { mStartAutopilotParams[TaxiConst.EVENT_PARAM_START_FAILURE_CODE] = failCode mStartAutopilotParams[TaxiConst.EVENT_PARAM_START_FAILURE_MSG] = failMsg } + + mStartAutopilotParams[TaxiConst.EVENT_PARAM_MAP_ORIGINAL_DATA] = + OCHAdasAbilityManager.getInstance().originalData + mStartAutopilotParams[TaxiConst.EVENT_PARAM_AUTOPILOT_STATE] = + CallerAutoPilotStatusListenerManager.getState() mStartAutopilotParams[TaxiConst.EVENT_PARAM_START_RESULT] = CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING + MogoAnalyticUtils.track(mStartAutopilotKey, mStartAutopilotParams) clearStartAutopilotParams() //清空参数数据，防止误传 } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index 078645cb83..46bf2e378b 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -39,6 +39,8 @@ class TaxiPassengerConst { const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_ORDER_NUMBER = "order_num" 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/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index 6116cf7383..24cb9a546a 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst import io.reactivex.disposables.Disposable @@ -49,8 +50,14 @@ object TaxiPassengerAnalyticsManager { mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_FAILURE_CODE] = failCode mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_FAILURE_MSG] = failMsg } + + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_MAP_ORIGINAL_DATA] = + OCHAdasAbilityManager.getInstance().originalData + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_AUTOPILOT_STATE] = + CallerAutoPilotStatusListenerManager.getState() mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_RESULT] = CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING + MogoAnalyticUtils.track(mStartAutopilotKey, mStartAutopilotParams) clearStartAutopilotParams() //清空参数数据，防止误传 } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt index 0e84fffa52..532662c104 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt @@ -63,6 +63,8 @@ class TaxiUnmannedConst { const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_LINE_ID = "line_id" const val EVENT_PARAM_ORDER_NUMBER = "order_num" + 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/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java index a6945fde00..c422872cdd 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java @@ -12,6 +12,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 com.mogo.och.taxi.constant.TaxiUnmannedConst; import java.util.HashMap; @@ -62,6 +63,10 @@ public class TaxiAnalyticsManager { mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_START_FAILURE_MSG, failMsg); } + mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_MAP_ORIGINAL_DATA, + OCHAdasAbilityManager.getInstance().getOriginalData()); + mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_AUTOPILOT_STATE, + CallerAutoPilotStatusListenerManager.INSTANCE.getState()); mStartAutopilotParams.put(TaxiUnmannedConst.EVENT_PARAM_START_RESULT, CallerAutoPilotStatusListenerManager.INSTANCE.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index eeccf6dc44..75e78bedbe 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -28,6 +28,8 @@ class TaxiPassengerConst { const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_ORDER_NUMBER = "order_num" 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/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index 54a0848119..f4a7b22c41 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst import io.reactivex.disposables.Disposable @@ -49,8 +50,14 @@ object TaxiPassengerAnalyticsManager { mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_FAILURE_CODE] = failCode mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_FAILURE_MSG] = failMsg } + + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_MAP_ORIGINAL_DATA] = + OCHAdasAbilityManager.getInstance().originalData + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_AUTOPILOT_STATE] = + CallerAutoPilotStatusListenerManager.getState() mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_RESULT] = CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING + MogoAnalyticUtils.track(mStartAutopilotKey, mStartAutopilotParams) clearStartAutopilotParams() //清空参数数据，防止误传 }