From c332a8cd772266272a5b071a30876fab4978214e Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 16 Feb 2022 15:22:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Bus/TaxiDriver=20v2.5.1]OCH:=20fragment=20?= =?UTF-8?q?commit=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/OchBusProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(); } } From aee3c7f056a0588e68724f2b9b86481855d25741 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Wed, 16 Feb 2022 15:41:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2.5.1=20=E6=BC=94=E7=A4=BA=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E6=97=B6=20?= =?UTF-8?q?=E9=87=8D=E7=BD=AEisIgnoreConditionsDrawAutopilotTrajectoryData?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 6 ++++++ 1 file changed, 6 insertions(+) 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 faf450483d..13676f4173 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 @@ -261,10 +261,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) }