From 4ae64fc939fd1e4f49152c3e1b4a4ca68003bbc8 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Mon, 17 Aug 2020 14:34:27 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix:=20=E4=BF=AE=E6=94=B9=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E6=A1=86=E5=92=8C=E5=B7=A6=E4=BE=A7adas=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=BD=93=E5=89=8D=E8=A7=A3=E5=86=B3=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E6=98=AF=E5=88=86=E4=BA=AB=E6=A1=86=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E9=9A=90=E8=97=8Fadas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/styles.xml            |  1 +
 .../com/mogo/module/share/ShareControl.java   | 35 +++++++------------
 .../share/dialog/LaucherShareDialog.java      | 18 ++++++++++
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/modules/mogo-module-common/src/main/res/values/styles.xml b/modules/mogo-module-common/src/main/res/values/styles.xml
index 162fe17f3e..5810a99910 100644
--- a/modules/mogo-module-common/src/main/res/values/styles.xml
+++ b/modules/mogo-module-common/src/main/res/values/styles.xml
@@ -5,6 +5,7 @@
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimAmount">0.85</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:fullBright">@android:color/transparent</item>
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
index ee53ecbe2b..44f63c0b82 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
@@ -32,6 +32,8 @@ import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.share.IMogoShareManager;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.service.tanlu.IMogoTanluProvider;
 import com.mogo.service.tanlu.TanluUploadParams;
 import com.mogo.utils.TipToast;
@@ -209,29 +211,16 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
             AIAssist.getInstance(context).registerUnWakeupCommand(UNWAKE_UPLOAD_ROAD_CONSTRUCTION,
                     UPLOAD_ROAD_CONSTRUCTION, this);
         }
-
-//        ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() {
-//            @Override
-//            public void showCarLocationInfo(CarLocationInfo info) {
-//                Logger.d(TAG, "获取到car location info: " + info.carId);
-//            }
-//
-//            @Override
-//            public void showOtherInfo(String info) {
-//                Logger.d(TAG, "获取到other info: " + info);
-//            }
-//
-//            @Override
-//            public void showTrafficLightInfo(TrafficLightInfo info) {
-//                Logger.d(TAG, "获取到traffic light info: " + info.id);
-//            }
-//
-//            @Override
-//            public void showCarEventInfo(CarEventInfo info) {
-//                Logger.d(TAG, "获取到car event info: " + info.describe);
-//            }
-//        });
-
+        if(!DebugConfig.isLauncher()) {
+            ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
+                @Override
+                public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+                    if (!isTrue) {
+                        dismissShareDialog();
+                    }
+                }
+            });
+        }
         Logger.d(TAG,"init over====");
     }
 
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
index 24202335b1..a07777a45f 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java
@@ -6,6 +6,7 @@ import android.view.WindowManager;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.dialog.BaseFloatDialog;
 import com.mogo.module.share.R;
 import com.mogo.module.share.manager.ISeekHelpListener;
@@ -193,4 +194,21 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL
         UploadHelper.INSTANCE.upload(mContext, params,true);
     }
 
+    @Override
+    public void show() {
+        Logger.d(TAG,"onShow====");
+        if(!DebugConfig.isLauncher()) {
+            mApis.getAdasControllerApi().closeADAS();
+        }
+        super.show();
+    }
+
+    @Override
+    public void dismiss() {
+        Logger.d(TAG,"onDismiss=====");
+        if (!DebugConfig.isLauncher()&&mApis.getStatusManagerApi().isMainPageOnResume()) {
+            mApis.getAdasControllerApi().showADAS();
+        }
+        super.dismiss();
+    }
 }