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 @@
- @null
- true
- @android:color/transparent
+ - 0.85
- true
- @null
- @android:color/transparent
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();
+ }
}