From 91cb2891cbca76bdb523c17e2e4c5d933c054009 Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Mon, 30 Nov 2020 20:13:49 +0800
Subject: [PATCH] fix bug

---
 gradle.properties                             |  2 +-
 .../module/common/dialog/BaseFloatDialog.java | 26 ++++++++++++++++++-
 .../share/dialog/GridFixableShareDialog.kt    | 12 ---------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0531e07889..125dc02de4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=1.9.0
+CARCHATTING_VERSION=1.9.1-SNAPSHOT
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
index b39f1dfb0c..d70fa857b7 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
@@ -7,7 +7,9 @@ import android.view.WindowManager;
 import androidx.annotation.NonNull;
 
 import com.mogo.commons.debug.DebugConfig;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.R;
+import com.mogo.utils.logger.Logger;
 
 /**
  * 浮在各种wm上面的dialog基类，调用了window.setType
@@ -15,13 +17,16 @@ import com.mogo.module.common.R;
  * @author tongchenfei
  */
 public class BaseFloatDialog extends Dialog {
+
+    private static final String TAG = "BaseFloatDialog";
+
     public BaseFloatDialog(@NonNull Context context) {
         this(context, R.style.BaseFloatDialogStyle);
     }
 
     public BaseFloatDialog(@NonNull Context context, int themeResId) {
         super(context, themeResId);
-        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
+        if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
             addFlag();
         }
     }
@@ -32,4 +37,23 @@ public class BaseFloatDialog extends Dialog {
                 | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
                 | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
     }
+
+    @Override
+    public void show() {
+        Logger.d(TAG, "onShow====");
+        if (DebugConfig.isNeedHideAdasWhenShare()) {
+            MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS();
+        }
+        super.show();
+    }
+
+    @Override
+    public void dismiss() {
+        Logger.d(TAG, "onDismiss====");
+        if (DebugConfig.isNeedHideAdasWhenShare()
+                && MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume()) {
+            MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS();
+        }
+        super.dismiss();
+    }
 }
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
index c91a4a13af..6c47af485f 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
@@ -105,22 +105,10 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) {
     }
 
     override fun show() {
-        Logger.d(TAG, "onShow====")
-        if (DebugConfig.isNeedHideAdasWhenShare()) {
-            mApis.adasControllerApi.closeADAS()
-        }
         gridBtnManager.showShareButton()
         super.show()
     }
 
-    override fun dismiss() {
-        Logger.d(TAG, "onDismiss=====")
-        if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) {
-            mApis.adasControllerApi.showADAS()
-        }
-        super.dismiss()
-    }
-
     companion object {
         private const val TAG = "GridFixableShareDialog"
     }