From c1034e824accd046feb5801018d07b583d586f87 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 14:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=AB=98=E5=BE=B7=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=90=8E=E5=BF=AB=E9=80=9F=E5=8F=98=E5=88=B0=E7=99=BD=E5=A4=A9?= =?UTF-8?q?/=E5=A4=9C=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=81?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=20e=20=E7=B3=BB=E5=88=97=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E9=9A=90=E8=97=8F=20adas=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 22 +++++++++++++++++++ .../com/mogo/launcher/MogoApplication.java | 1 + .../com/mogo/commons/debug/DebugConfig.java | 12 ++++++++-- .../map/AutoNaviBroadcastIntentHandler.java | 7 ++++++ .../module/map/MapControlCommandHandler.java | 4 ++++ .../com/mogo/module/map/MapPresenter.java | 8 +++++++ .../mogo/module/map/OnMapControlCallback.java | 3 +++ .../share/dialog/GridFixableShareDialog.kt | 2 +- 8 files changed, 56 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c505195521..ee51cfe30a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,6 +121,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // f系列-分体机 @@ -144,6 +146,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列，采用Launcher方案 e8xx { @@ -166,6 +170,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // 同上 em4 { @@ -188,6 +194,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -210,6 +218,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -232,6 +242,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em2 { @@ -254,6 +266,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // d系列 d8xx { @@ -276,6 +290,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // d系列 2 + 32 d80x { @@ -298,6 +314,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // d系列 1+16 版本 d82x { @@ -320,6 +338,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // 比亚迪 bydauto { @@ -342,6 +362,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3bfce8ee6e..e1756677c0 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -129,6 +129,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY ); DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED ); DebugConfig.setNeedLoadGuideModule( BuildConfig.IS_NEED_LOAD_GUIDE_MODULE ); + DebugConfig.setNeedHideAdas( BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 1c5d3e4307..3113c05d9f 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -1,7 +1,5 @@ package com.mogo.commons.debug; -import com.mogo.utils.logger.Logger; - /** * @author congtaowang * @since 2019-12-23 @@ -318,4 +316,14 @@ public class DebugConfig { public static boolean isNeedLoadGuideModule() { return isNeedLoadGuideModule; } + + private static boolean isNeedHideAdasWhenShare = false; + + public static boolean isNeedHideAdasWhenShare() { + return isNeedHideAdasWhenShare; + } + + public static void setNeedHideAdas( boolean isNeedHideAdas ) { + DebugConfig.isNeedHideAdasWhenShare = isNeedHideAdas; + } } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java index e4257b5efc..964039e1f0 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java @@ -26,6 +26,7 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { // 接收高德 public static final String AUTONAVI_STANDARD_BROADCAST_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND"; + private EnumMapUI mLastAMapUiType = null; public void register( IMogoIntentManager manager ) { manager.registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this ); @@ -131,11 +132,17 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { // 高德改变黑夜白天模式后，传递给launcher，顺便改变其他 if ( extraState == 37 ) { // 白天模式 + mLastAMapUiType = EnumMapUI.Type_Light; MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Light ); } else if ( extraState == 38 ) { // 夜间模式 + mLastAMapUiType = EnumMapUI.Type_Night; MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Night ); } } } + + public EnumMapUI getLastAMapUiType() { + return mLastAMapUiType; + } } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java index 94d8c5d59a..9d0bf3daae 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java @@ -103,6 +103,10 @@ class MapControlCommandHandler { return; } + if ( mCallback.getAMapLastType() == ui ) { + return; + } + int KEY_TYPE = 10048; int state = 0;//2黑夜;1白天 ;0自动 switch ( ui ) { diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java index 3ff064cefc..9e34462381 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java @@ -296,6 +296,14 @@ public class MapPresenter extends Presenter< MapView > implements mRegisterCenter.registerADASControlStatusChangedListener( TAG, this ); } + @Override + public EnumMapUI getAMapLastType() { + if ( mAutoNaviReceiver != null ) { + return mAutoNaviReceiver.getLastAMapUiType(); + } + return null; + } + private void initBroadcast() { mAutoNaviReceiver = new AutoNaviBroadcastIntentHandler(); mAutoNaviReceiver.setCallback( this ); diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java index cd6263370d..0d866efc2f 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java @@ -36,4 +36,7 @@ public interface OnMapControlCallback { // 缩放地图 void onZoomMap( boolean zoomIn ); + + // 高德地图上次类型 + EnumMapUI getAMapLastType(); } \ No newline at end of file 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 59658be08a..03aa7ed0ae 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 @@ -106,7 +106,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { override fun show() { Logger.d(TAG, "onShow====") - if (!DebugConfig.isLauncher()) { + if (!DebugConfig.isNeedHideAdasWhenShare()) { mApis.adasControllerApi.closeADAS() } gridBtnManager.showShareButton()