From 699fc13f94bb49c363c161163231cc4fc28abd45 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 8 Jun 2020 14:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E2=80=9C=E5=85=A8=E8=A7=88=E2=80=9D=E2=80=9C=E6=AD=A3?= =?UTF-8?q?=E5=8C=97=E2=80=9D=E2=80=9C=E9=80=80=E5=87=BA=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E2=80=9D=E4=B8=89=E4=B8=AA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/map/CustomNaviInterrupter.java | 6 +++++- .../extensions/entrance/EntranceFragment.java | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/CustomNaviInterrupter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/CustomNaviInterrupter.java index c77dc49167..701bfa73c2 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/CustomNaviInterrupter.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/CustomNaviInterrupter.java @@ -36,10 +36,14 @@ class CustomNaviInterrupter implements Interrupter { sInstance = null; } + /** + * 判断是否用自己的导航 + * @return true-用高德公版车机版地图 false-用Launcher自己的导航 + */ @Override public boolean interrupt() { if ( AppUtils.isAppInstalled( AbsMogoApplication.getApp(), "com.autonavi.amapauto" ) - || DebugConfig.isUseCustomNavi() ) { + || !DebugConfig.isUseCustomNavi() ) { Logger.d( TAG, "do not use custom map function." ); return true; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 465c4bff54..341cda917f 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -34,6 +34,7 @@ import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener; import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager; import com.mogo.module.common.dialog.WMDialog; +import com.mogo.module.common.map.CustomNaviInterrupter; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.extensions.ExtensionsModuleConst; @@ -432,13 +433,19 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent @Override public void onStartNavi() { TopViewAnimHelper.getInstance().showNaviView(); - mExitNavi.setVisibility( View.VISIBLE ); mMApUIController.changeMapMode( mCameraMode.isSelected() ? EnumMapUI.NorthUP_2D : EnumMapUI.CarUp_2D ); MapCenterPointStrategy.setMapCenterPointBySceneAndDelay( mMApUIController, Scene.NAVI, 500, () -> { return !mMogoNavi.isNaviing(); } ); - mDisplayOverview.setVisibility( View.VISIBLE ); - mCameraMode.setVisibility( View.VISIBLE ); + if(CustomNaviInterrupter.getInstance().interrupt()){ + mDisplayOverview.setVisibility(View.GONE); + mCameraMode.setVisibility(View.GONE); + mExitNavi.setVisibility( View.GONE ); + }else { + mExitNavi.setVisibility( View.VISIBLE ); + mDisplayOverview.setVisibility(View.VISIBLE); + mCameraMode.setVisibility( View.VISIBLE ); + } mApis.getAnalyticsApi().track( "Navigation_begin", new HashMap<>() ); } @@ -511,7 +518,11 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent } else { mDisplayOverviewText.setText( "全览" ); mDisplayOverviewText.setTextSize( TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize( R.dimen.module_ext_display_overview_textSize_large ) ); - mCameraMode.setVisibility( View.VISIBLE ); + if(CustomNaviInterrupter.getInstance().interrupt()){ + mCameraMode.setVisibility(View.GONE); + }else { + mCameraMode.setVisibility(View.VISIBLE); + } } } }