diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
index 06e98681c0..430909a7b4 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java
@@ -71,27 +71,27 @@ public class BusTrajectoryManager {
         if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
             // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载");
-            ToastUtils.showShort("轨迹开始下载");
+            // ToastUtils.showShort("轨迹开始下载");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
             // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功");
-            ToastUtils.showShort("轨迹下载成功");
+            // ToastUtils.showShort("轨迹下载成功");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
             // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地无对应轨迹");
-            ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
+            // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
         } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
             // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地有对应轨迹，认为成功");
-            ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
+            // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
         } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
             // 5. 轨迹管理_轨迹下载超时
             CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时");
-            ToastUtils.showShort("轨迹下载超时");
+            // ToastUtils.showShort("轨迹下载超时");
         }
     }
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java
index 080b15b6fc..4773358920 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerStartAutopilotView.java
@@ -241,7 +241,10 @@ public class TaxiPassengerStartAutopilotView extends RelativeLayout implements V
 
     @Override
     protected void onDetachedFromWindow() {
-        closeAllAnimsAndView();
+        isStarting = false;
+        clearStartingAnimFrame();
+        clearBgAnimDrawable();
+        mContext = null;
         super.onDetachedFromWindow();
     }
 }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
index 58d80c572c..f40200dc4c 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
@@ -211,6 +211,7 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
 
         if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){
             TaxiModel.getInstance().startDynamicCalculateRouteInfo();
+            runOnUIThread(() -> mView.updateCtvAutopilotStatusTag(true));
         }
 
         if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus ||
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 9b94b4e277..c033d594e5 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -91,7 +91,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         groupTestPanel = findViewById(R.id.groupTestPanel);
         ctvAutopilotStatus = findViewById(R.id.module_mogo_och_autopilot_status);
         ctvAutopilotStatus.setBackground(getResources().getDrawable(R.drawable.taxi_autopilot_bg_selector));
-        ctvAutopilotStatus.setTag(false);
+        updateCtvAutopilotStatusTag(false);
         mAutopilotImage = findViewById(R.id.module_och_autopilot_iv);
         mAutopilotTv = findViewById(R.id.module_och_autopilot_tv);
         flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container);
@@ -296,8 +296,12 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         });
     }
 
+    public void updateCtvAutopilotStatusTag(boolean tag){
+        ctvAutopilotStatus.setTag(tag);
+    }
+
     public void onCheckPilotConditionSafe(boolean isSafe){
-        ctvAutopilotStatus.setTag(isSafe);
+        updateCtvAutopilotStatusTag(isSafe);
         if (isSafe){
             ToastUtils.showLong(getResources().getString(
                     R.string.module_och_taxi_order_choose_start_autopilot_tip));
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
index d436061208..04b619566e 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
@@ -75,27 +75,27 @@ public class TaxiTrajectoryManager {
         if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
             // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载");
-            ToastUtils.showShort("轨迹开始下载");
+            // ToastUtils.showShort("轨迹开始下载");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
             // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功");
-            ToastUtils.showShort("轨迹下载成功");
+            // ToastUtils.showShort("轨迹下载成功");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
             // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地无对应轨迹");
-            ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
+            // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
         } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
             // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地有对应轨迹，认为成功");
-            ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
+            // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
         } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
             // 5. 轨迹管理_轨迹下载超时
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时");
-            ToastUtils.showShort("轨迹下载超时");
+            // ToastUtils.showShort("轨迹下载超时");
         }
      }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index e320246b31..0478f29693 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -1045,14 +1045,16 @@
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
+                        android:background="@drawable/debug_setting_edit_bg"
                         android:gravity="center_vertical">
 
                         <TextView
                             android:id="@+id/tvCurEnv"
                             android:layout_width="0dip"
                             android:layout_height="wrap_content"
-                            android:textColor="#1A1A1A"
+                            android:textColor="#000"
                             android:gravity="start"
+                            android:layout_marginStart="@dimen/dp_10"
                             android:textSize="@dimen/dp_24"
                             android:layout_weight="1"
                             tools:text="当前环境:"/>
@@ -1062,7 +1064,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="@dimen/dp_8"
-                            android:layout_marginStart="20px"
+                            android:layout_marginEnd="@dimen/dp_10"
                             android:text="切换环境"
                             android:textSize="@dimen/dp_24"
                             android:textColor="#1A1A1A"/>