diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index 1212ebb74a..cc1a76cebf 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -330,8 +330,8 @@ public class BusOrderModel {
     private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() {
         @Override
         public void onStartAutopilotFailure(@NonNull String startFailedMessage) {
-            BusAnalyticsManager.getInstance().triggerStartAutopilotFailureEvent(startFailedMessage);
-            if (mADASStatusCallback != null){
+            BusAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedMessage);
+            if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode){
                 CallerLogger.INSTANCE.e( M_BUS + TAG, "mAdasStartFailureListener = "+startFailedMessage );
                 mADASStatusCallback.onStartAdasFailure();
             }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java
index 3a9db07933..f06c6bbd72 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java
@@ -1,5 +1,6 @@
 package com.mogo.och.bus.util;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
 import android.text.TextUtils;
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
@@ -8,10 +9,10 @@ import com.mogo.eagle.core.data.app.AppConfigInfo;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
+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.OCHAdasAbilityManager;
 
 import java.util.HashMap;
 
@@ -38,7 +39,13 @@ public class BusAnalyticsManager {
         triggerStartAutopilotFailureEvent("15s后app等待超时");
     };
 
-    public void triggerStartAutopilotFailureEvent(String failMsg){
+    public void triggerStartAutopilotFailureEventByAdas(String failMsg){
+        removeWaitingCallback();
+        triggerStartAutopilotFailureEvent(failMsg);
+    }
+
+    private void triggerStartAutopilotFailureEvent(String failMsg){
+        CallerLogger.INSTANCE.e( M_BUS + "triggerStartAutopilotFailureEvent", failMsg );
         mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_RESULT
                 , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() ==
                         IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);
@@ -47,6 +54,13 @@ public class BusAnalyticsManager {
         AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
     }
 
+    private void removeWaitingCallback() {
+        if (startAutopilotRunnable != null &&
+                UiThreadHandler.getsUiHandler().hasCallbacks(startAutopilotRunnable)) {
+            UiThreadHandler.removeCallbacks(startAutopilotRunnable);
+        }
+    }
+
     /**
      * 触发'开启自动驾驶'埋点流程
      * 开启自动驾驶，15s内成功则发送成功埋点，否则发送失败埋点
@@ -73,10 +87,7 @@ public class BusAnalyticsManager {
 
         if (send) {
             // 开启成功，上报埋点
-            if (startAutopilotRunnable != null &&
-                    UiThreadHandler.getsUiHandler().hasCallbacks(startAutopilotRunnable)) {
-                UiThreadHandler.removeCallbacks(startAutopilotRunnable);
-            }
+            removeWaitingCallback();
             mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_RESULT, true);
             AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
         } else {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt
index 89bdaaddae..b303ea69e0 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt
@@ -56,6 +56,7 @@ class TaxiPassengerConst {
         const val EVENT_PARAM_END_NAME = "end_name"
         const val EVENT_PARAM_ORDER_NUMBER = "order_num"
         const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false
+        const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因
         const val EVENT_PARAM_PLATE_NUM = "plate_number" // 车牌号
         const val EVENT_PARAM_ENV_ONLINE = "env_online" // 是否线上环境：true/false
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java
index ba1670d046..18ba2e1e39 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java
@@ -35,6 +35,8 @@ public class TaxiPassengerAnalyticsManager {
     private Runnable startAutopilotRunnable = () -> {
         // 15s内未开启，上报失败埋点
         mStartAutopilotParams.put(TaxiPassengerConst.EVENT_PARAM_START_RESULT, false);
+        mStartAutopilotParams.put(TaxiPassengerConst.EVENT_PARAM_START_FAILURE_MSG,
+                "15s后app等待超时");
         AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
     };
 
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 9c70c9d107..348ca2acbe 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1016,8 +1016,8 @@ public class TaxiModel {
     private final OchAdasStartFailureCallback mAdasStartFailureListener = new OchAdasStartFailureCallback() {
         @Override
         public void onStartAutopilotFailure(@NonNull String startFailedMessage) {
-            TaxiAnalyticsManager.getInstance().triggerStartAutopilotFailureEvent(startFailedMessage);
-            if (mADASStatusCallback != null){
+            TaxiAnalyticsManager.getInstance().triggerStartAutopilotFailureEventByAdas(startFailedMessage);
+            if (mADASStatusCallback != null && !FunctionBuildConfig.isDemoMode){
                 CallerLogger.INSTANCE.e(M_TAXI + TAG, "mAdasStartFailureListener = "+startFailedMessage);
                 mADASStatusCallback.onStartAdasFailure();
             }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java
index e1fbcb954b..b6180d52d5 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java
@@ -1,14 +1,15 @@
 package com.mogo.och.taxi.utils;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 import android.text.TextUtils;
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.app.AppConfigInfo;
 import com.mogo.eagle.core.function.call.analytics.AnalyticsManager;
+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.OCHAdasAbilityManager;
 import com.mogo.och.taxi.constant.TaxiConst;
 
 import java.util.HashMap;
@@ -38,7 +39,20 @@ public class TaxiAnalyticsManager {
         triggerStartAutopilotFailureEvent("15s后app等待超时");
     };
 
-    public void triggerStartAutopilotFailureEvent(String failMsg){
+    public void triggerStartAutopilotFailureEventByAdas(String failMsg){
+        removeWaitingCallback();
+        triggerStartAutopilotFailureEvent(failMsg);
+    }
+
+    private void removeWaitingCallback() {
+        if (startAutopilotRunnable != null &&
+                UiThreadHandler.getsUiHandler().hasCallbacks(startAutopilotRunnable)) {
+            UiThreadHandler.removeCallbacks(startAutopilotRunnable);
+        }
+    }
+
+    private void triggerStartAutopilotFailureEvent(String failMsg){
+        CallerLogger.INSTANCE.e(M_TAXI + "triggerStartAutopilotFailureEvent", failMsg);
         mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_RESULT, false);
         mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_FAILURE_MSG,
                 failMsg);
@@ -73,10 +87,7 @@ public class TaxiAnalyticsManager {
 
         if (send) {
             // 开启成功，上报埋点
-            if (startAutopilotRunnable != null &&
-                    UiThreadHandler.getsUiHandler().hasCallbacks(startAutopilotRunnable)) {
-                UiThreadHandler.removeCallbacks(startAutopilotRunnable);
-            }
+            removeWaitingCallback();
             mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_RESULT, true);
             AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams);
         } else {