diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
index 4dba8c93ac..4154e95528 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java
@@ -51,17 +51,17 @@ public class OchBusProvider implements IMogoOCH {
         if (busFragment == null) {
             Logger.d(TAG, "准备add fragment======");
             busFragment = new OchBusFragment();
-            activity.getSupportFragmentManager().beginTransaction().add(containerId, busFragment).commit();
+            activity.getSupportFragmentManager().beginTransaction().add(containerId, busFragment).commitAllowingStateLoss();
             return;
         }
         Logger.d(TAG, "准备show fragment");
-        activity.getSupportFragmentManager().beginTransaction().show(busFragment).commit();
+        activity.getSupportFragmentManager().beginTransaction().show(busFragment).commitAllowingStateLoss();
     }
 
     private void hideFragment() {
         if (busFragment != null) {
             Logger.d(TAG, "准备hide fragment");
-            activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commit();
+            activity.getSupportFragmentManager().beginTransaction().hide(busFragment).commitAllowingStateLoss();
         }
 
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 396cbaf9ef..9ae24adbf7 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -284,10 +284,16 @@ class DebugSettingView @JvmOverloads constructor(
                 SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false)
         CallerAutoPilotManager.setDemoMode(isDemoMode)
         tbIsDemoMode.isChecked = isDemoMode
+        if (isDemoMode){
+            FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
+        }
         // 演示模式
         tbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked ->
             CallerAutoPilotManager.setDemoMode(isChecked)
             FunctionBuildConfig.isDemoMode = isChecked
+            if (!FunctionBuildConfig.isDemoMode){
+                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = false
+            }
             SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked)
         }