From d70784f1810bd86878d8890355a66d1c6310224b Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 22 Jul 2020 15:28:57 +0800
Subject: [PATCH] =?UTF-8?q?m4=20=E7=B3=BB=E5=88=97=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E6=8C=89home=E9=94=AE=E4=BC=9A=E9=80=A0=E6=88=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2pause=E5=90=8Eresume=EF=BC=8C=E9=80=A0=E6=88=90adas=20?=
 =?UTF-8?q?panel=20=E9=97=AA=E7=83=81=20f=20=E7=B3=BB=E5=88=97=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8A=E6=BB=91=E8=BF=94=E5=9B=9E=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=90=8E=E4=BC=9A=E8=B5=B0=20mIsHomeKeyDown=20=3D=20true?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E4=B8=8D=E4=BC=9A=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2pause=20=E7=8B=AC=E7=AB=8B=20app=20=E4=BB=BB?=
 =?UTF-8?q?=E4=BD=95=E6=83=85=E5=86=B5=E4=B8=8B=E9=83=BD=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=20adas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/module/main/MainActivity.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 289284bae5..e2107ca415 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -25,6 +25,7 @@ import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.common.map.MapCenterPointStrategy;
 import com.mogo.module.common.map.Scene;
+import com.mogo.module.common.utils.CarSeries;
 import com.mogo.module.main.cards.MogoModulesHandler;
 import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.module.main.service.MogoMainService;
@@ -235,12 +236,21 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         super.onPause();
         mMogoStatusManager.setMainPageResumeStatus( TAG, false );
         mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
-        if ( !mIsHomeKeyDown ) {
+        if ( shouldCloseADASPanel() ) {
             mServiceApis.getAdasControllerApi().closeADAS();
         }
         mIsHomeKeyDown = false;
     }
 
+    private boolean shouldCloseADASPanel(){
+        // m4 系列因为按home键会造成页面pause后resume，造成adas panel 闪烁
+        // f 系列加上上滑返回桌面后会走 mIsHomeKeyDown = true，但是不会造成页面pause
+        // 独立 app 任何情况下都需要隐藏 adas
+        return !mIsHomeKeyDown
+                || CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X
+                || !DebugConfig.isLauncher();
+    }
+
     @Override
     protected void onStop() {
         super.onStop();