[6.6.0]

[common] [自驾埋点变更]
2024-08-30 17:21:16 +08:00
parent 11303f29a5
commit bb128de749
34 changed files with 404 additions and 166 deletions
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
@@ -9,11 +9,13 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.weaknet.fragment.ShuttleFragment
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.provider.CommonServiceImpl
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
 import com.mogo.och.weaknet.database.repository.EventRepository
 import com.mogo.och.weaknet.database.repository.LineRepository
 import com.mogo.och.weaknet.database.repository.TaskRepository
 import com.mogo.och.weaknet.database.repository.TaskSiteRepository
 import com.mogo.och.weaknet.model.BusLineModel
+import com.mogo.och.weaknet.util.BusAnalyticsManager

 /**
 * 网约车小巴业务实现入口
@@ -40,12 +42,14 @@ class ShuttleDriverProvider : CommonServiceImpl() {
        if (busFragment == null) {
            busFragment = ShuttleFragment()
        }
+        OchAutopilotAnalytics.ochEventKey = BusAnalyticsManager
        BusLineModel.init();
        return busFragment!!
    }

    override fun resetFragment() {
        busFragment = null
+        OchAutopilotAnalytics.ochEventKey = null
        BusLineModel.release()
    }

--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
@@ -19,7 +19,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
-import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -27,10 +26,12 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation
-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.canStartAutoPilot
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.canStartAutoPilotByDistance
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.canStartAutoPilotSSM
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager.startAutoPilot
+import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
@@ -41,7 +42,6 @@ import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction
 import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.manager.socket.lan.LedScreenManager
-import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg
 import com.mogo.och.common.module.utils.DateTimeUtil
@@ -50,8 +50,6 @@ import com.mogo.och.common.module.utils.OCHThreadPoolManager
 import com.mogo.och.common.module.utils.ResourcesUtils
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice.showNotice
-import com.mogo.och.data.bean.BusRoutesResult
-import com.mogo.och.data.bean.BusTransferData
 import com.mogo.och.shuttle.weaknet.R
 import com.mogo.och.weaknet.callback.IBusADASStatusCallback
 import com.mogo.och.weaknet.constant.BusConst
@@ -156,7 +154,7 @@ object OrderModel {
            }

            override fun onStartAutopilotFailure(startFailedCode: String, startFailedMessage: String) {
-                BusAnalyticsManager.triggerStartAutopilotFailureEventByAdas(
+                OchAutopilotAnalytics.triggerStartAutopilotFailureEventByAdas(
                    startFailedCode,
                    startFailedMessage,
                    System.currentTimeMillis()
@@ -372,7 +370,15 @@ object OrderModel {
     * @param isRestart
     */
    private fun startAutopilot(isRestart: Boolean) {
-        BusAnalyticsManager.triggerClickStartAutopilotTime(System.currentTimeMillis())
+
+        /**
+         * 存在Session
+         */
+        if (!OchAutoPilotManager.canStartAutopilotBySessionId()) {
+            return;
+        }
+
+        OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis())

        //1、判断轨迹url是否可用
        if(LineManager.contraiInfo==null){
@@ -399,10 +405,10 @@ object OrderModel {
        }

        // 3、距离轨迹15m计算
-        var resion = canStartAutoPilot(LineManager.contraiInfo!!.lineId)
+        var resion = canStartAutoPilotByDistance(LineManager.contraiInfo!!.lineId)
        if (TrajectoryAndDistanceManager.errorTypeNoneLineId == resion) {
            setTrajectoryStation(false)
-            resion = canStartAutoPilot(LineManager.contraiInfo!!.lineId)
+            resion = canStartAutoPilotByDistance(LineManager.contraiInfo!!.lineId)
        }
        if (!StringUtils.isEmpty(resion)) {
            ToastUtils.showShort(resion)
@@ -700,7 +706,7 @@ object OrderModel {
    fun triggerStartServiceEvent(isRestart: Boolean, send: Boolean) {
        LineManager.startStation?.let {startStation->
            LineManager.endStation?.let {endStation->
-                BusAnalyticsManager.triggerStartAutopilotEvent(
+                OchAutopilotAnalytics.triggerStartAutopilotEvent(
                    isRestart,
                    send,
                    startStation.name,
@@ -715,14 +721,14 @@ object OrderModel {
    }

    fun triggerUpdateStartAutoPilotSessionId(sessionId: Long) {
-        BusAnalyticsManager.triggerUpdateStartAutoPilotSessionId(sessionId)
+        OchAutopilotAnalytics.triggerUpdateStartAutoPilotSessionId(sessionId)
    }

    fun triggerUnableStartAPReasonEvent() {
        LineManager.startStation?.let {startStation->
            LineManager.endStation?.let {endStation->
                if(LineManager.lineInfos!=null){
-                    BusAnalyticsManager.triggerUnableStartAPReasonEvent(
+                    OchAutopilotAnalytics.triggerUnableStartAPReasonEvent(
                        startStation.name, endStation.name,LineManager.lineInfos!!.lineId.toString() , "",
                        OCHAdasAbilityManager.getInstance().autopilotUnAbilityReason
                    )
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.och.weaknet.util

-import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics
+import com.mogo.och.common.module.manager.autopilot.autopilot.IOchEventKey


 /**
@@ -9,7 +9,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalyt
 *
 * Created on 2022/3/24
 */
-object BusAnalyticsManager : OchAutopilotAnalytics() {
+object BusAnalyticsManager : IOchEventKey {

    // 埋点key：开启自动驾驶前已识别的异常，会导致无法开启自驾
    private const val EVENT_KEY_AP_UNABLE_START_REASON =