From a3b65964eb4346da6cd25aa3351fc70353763f5e Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 14:45:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=90=8E=E5=BF=AB=E9=80=9F=E5=8F=98=E5=88=B0=E7=99=BD?= =?UTF-8?q?=E5=A4=A9/=E5=A4=9C=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E8=A7=A3=E5=86=B3=20e=20=E7=B3=BB=E5=88=97=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E9=9A=90=E8=97=8F=20adas=20=E7=9A=84=E9=97=AE?= =?UTF-8?q?=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() From 9cbd9fa69ba07c7367f2314528b3c5bd06ef288d Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 14:51:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 2 +- .../src/main/java/com/mogo/commons/debug/DebugConfig.java | 2 +- .../com/mogo/module/share/dialog/GridFixableShareDialog.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index e1756677c0..f18f22db6d 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -129,7 +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 ); + DebugConfig.setNeedHideAdasWhenShare( 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 3113c05d9f..aa08c2fec0 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 @@ -323,7 +323,7 @@ public class DebugConfig { return isNeedHideAdasWhenShare; } - public static void setNeedHideAdas( boolean isNeedHideAdas ) { + public static void setNeedHideAdasWhenShare( boolean isNeedHideAdas ) { DebugConfig.isNeedHideAdasWhenShare = isNeedHideAdas; } } 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 03aa7ed0ae..c91a4a13af 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.isNeedHideAdasWhenShare()) { + if (DebugConfig.isNeedHideAdasWhenShare()) { mApis.adasControllerApi.closeADAS() } gridBtnManager.showShareButton() @@ -115,7 +115,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { override fun dismiss() { Logger.d(TAG, "onDismiss=====") - if (!DebugConfig.isLauncher() && mApis.statusManagerApi.isMainPageOnResume) { + if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) { mApis.adasControllerApi.showADAS() } super.dismiss() From ac28b024d7bd5b94fd7319b8d3932c909af16344 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 16:38:52 +0800 Subject: [PATCH 3/5] bugfix: D80XCD-1598 --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2379b3e458..d20907333f 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 @@ -371,7 +371,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme AIAssist.getInstance( this ).release(); mServiceApis.getOnlineCarPanelApi().clear(); if ( CallChatApi.getInstance().getApiProvider() != null ) { - CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); +// CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); } ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); From 586d33e32729aedc60ee5d0e4d96befdccdc4d98 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 26 Nov 2020 17:23:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=8C=E9=9D=A2?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=8C=89=E9=92=AE=E9=97=B4=E8=B7=9D?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9adas=E6=95=B0=E6=8D=AE=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml | 2 +- .../main/java/com/mogo/module/share/StrategyShareProvider.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml index c335dd18d9..c91b026b20 100644 --- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml @@ -23,7 +23,7 @@ 160px 160px - 30px + 10px 100px 100px \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt index ab742b4709..2a15148a56 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt @@ -48,7 +48,7 @@ class StrategyShareProvider : IProvider { // adas返回前车距离，单位是米 val frontDistanceItem = GsonUtil.objectFromJson(it, AdasFrontCarDistanceY::class.java) frontDistanceItem.result.distanceY?.apply { - blockStrategy.refreshFrontDistance(it.toDouble().toInt()) + blockStrategy.refreshFrontDistance(this.toDouble().toInt()) } } } catch (e: Exception) { From c0a1cce3289e6c2624a6f4acf424613789083912 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 26 Nov 2020 18:25:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...png => service_car_panel_call_pressed_light.png} | Bin .../selector_service_car_panel_call_light.xml | 2 +- ...png => service_car_panel_call_pressed_light.png} | Bin 3 files changed, 1 insertion(+), 1 deletion(-) rename skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/{service_car_pannel_call_pressed_light.png => service_car_panel_call_pressed_light.png} (100%) rename skin/mogo-skin-light/src/main/module-services-res/drawable/{service_car_pannel_call_pressed_light.png => service_car_panel_call_pressed_light.png} (100%) diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml index 980f940645..a0367b590f 100644 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_pannel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png