解决高德地图设置自动模式后快速变到白天/夜间的问题、解决 e 系列分享隐藏 adas 的问题

2020-11-26 14:45:28 +08:00
parent 6e3c0b117d
commit c1034e824a
8 changed files with 56 additions and 3 deletions
--- 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"
--- 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
--- 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;
+    }
 }
--- 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;
+    }
 }
--- 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 ) {
--- 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 );
--- 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();
 }
--- 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()