From 54a04f2bae96a344f141631f3fb32c798d368dba Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 24 Nov 2020 10:22:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20MAIN=5FPAGE=5FCREATED=20?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=80=BC=E5=8F=8A=E5=85=B6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 -- .../src/main/java/com/mogo/module/service/MogoServices.java | 4 ++++ .../v2x/scenario/scene/animation/V2XAnimationScenario.java | 2 +- .../v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java | 2 +- .../v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java | 2 +- .../v2x/scenario/scene/park/V2XIllegalParkScenario.java | 4 ++-- .../module/v2x/scenario/scene/push/V2XPushEventScenario.java | 2 +- .../module/v2x/scenario/scene/road/V2XRoadEventScenario.java | 4 ++-- .../module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java | 2 +- .../module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) 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 cbfca98eda..713108df6c 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 @@ -277,7 +277,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onResume() { super.onResume(); mMogoStatusManager.setMainPageResumeStatus( TAG, true ); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, false ); if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { mServiceApis.getAdasControllerApi().showADAS(); @@ -291,7 +290,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onPause() { super.onPause(); mMogoStatusManager.setMainPageResumeStatus( TAG, false ); - mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); mServiceApis.getAuthManagerApi().dismiss(); if ( shouldCloseADASPanelWhenPause() ) { mServiceApis.getAdasControllerApi().closeADAS(); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index a41cde3874..55c95def40 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -755,6 +755,10 @@ public class MogoServices implements IMogoMapListener, return; } + if (!mStatusManager.isMainPageOnResume()) { + return; + } + if (mStatusManager.isV2XShow()) { return; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java index 0318dd5296..c307a293ce 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java @@ -41,7 +41,7 @@ public class V2XAnimationScenario extends AbsV2XScenario { @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { boolean isV2XAnimationShow = V2XServiceManager.getMoGoV2XStatusManager().isV2XAnimationShow(); if (isV2XAnimationShow) { close(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java index 9a3ad242f3..f8154af9af 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java @@ -59,7 +59,7 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario @Override public void init(@Nullable V2XMessageEntity v2XMessageEntity) { if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { boolean isWindowShow = V2XServiceManager.getMoGoV2XStatusManager().isLeftLiveVideoShow(); if (isWindowShow) { close(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java index 2132f366c0..13417215ee 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java @@ -51,7 +51,7 @@ public class V2XIllegalParkScenario extends AbsV2XScenario i Logger.w(MODULE_NAME, "处理推送场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); if (!isSameScenario(v2XMessageEntity) - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { setV2XMessageEntity(v2XMessageEntity); show(); } else { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index eb1620f712..cddb478e41 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -96,7 +96,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING, getV2XMessageEntity().getContent().getNoveltyInfo()); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { showWindow(); } @@ -197,7 +197,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp @Override public void onViewAdded(View view) { Logger.d(MODULE_NAME, "展示 Window 动画结束"); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { if (getV2XMessageEntity() != null && getV2XMessageEntity().isNeedAddLine() == true) { drawPOI(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java index 10da5513fe..dfbca41438 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java @@ -81,7 +81,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario> i saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING, mV2XPushMessageEntity); - if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { if (getV2XMessageEntity() != null && !V2XServiceManager.getMoGoV2XStatusManager().isOtherSeekHelpWindowShow()) { show(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java index 96bd61f965..4e9ef2e810 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java @@ -51,7 +51,7 @@ public class V2XEventUgcScenario extends AbsV2XScenario impl setV2XMessageEntity(v2XMessageEntity); if (v2XMessageEntity != null) { if (v2XMessageEntity.isShowState() - && V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) { + && V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { show(); } }