From dd59de922977f787cb0fccbc6f31e1a5a9e7e3f1 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 9 Apr 2020 11:52:23 +0800 Subject: [PATCH] dev --- gradle.properties | 2 +- .../map/impl/amap/AMapNaviViewWrapper.java | 2 +- .../mogo/map/impl/amap/navi/NaviClient.java | 7 +++++++ .../impl/amap/navi/NaviListenerAdapter.java | 6 ++++++ .../map/impl/amap/navi/NaviOverlayHelper.java | 7 +++++++ .../java/com/mogo/map/navi/IMogoNavi.java | 5 +++++ .../src/main/java/com/mogo/map/MogoNavi.java | 7 +++++++ .../com/mogo/module/map/MapPresenter.java | 19 ++++++++++++------- 8 files changed, 46 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index dc8c382438..d3203a0318 100644 --- a/gradle.properties +++ b/gradle.properties @@ -62,7 +62,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.3 +MOGO_MODULE_V2X_VERSION=1.0.3.2 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.3 # 推送 diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 2c404644cf..22910f3aaf 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -619,7 +619,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, public void displayOverview() { if ( checkAMapView() ) { if ( NaviClient.getInstance( getContext() ).isNaviing() ) { - mMapView.displayOverview(); + NaviClient.getInstance( getContext() ).displayOverview(); } } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java index 625b8bb4dd..4cfbf72237 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java @@ -274,4 +274,11 @@ public class NaviClient implements IMogoNavi { public void stopAimlessMode() { mAMapNavi.stopAimlessMode(); } + + @Override + public void displayOverview() { + if ( mAMapNaviListener != null ) { + mAMapNaviListener.displayOverview(); + } + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java index 1b6eef41bc..183eb2315d 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java @@ -294,4 +294,10 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { mNaviOverlayHelper.setCalculatePathDisplayBounds( bounds ); } } + + public void displayOverview(){ + if ( mNaviOverlayHelper != null ) { + mNaviOverlayHelper.displayOverview(); + } + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java index d0472098d2..df08a809a3 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java @@ -447,4 +447,11 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction { mBoundRect = bounds; } } + + /** + * 展示全程 + */ + public void displayOverview(){ + showCalculatedPaths( null ); + } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java index 7ce05a83bc..1b5561d217 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java @@ -158,4 +158,9 @@ public interface IMogoNavi { * 关闭巡航模式 */ void stopAimlessMode(); + + /** + * 查看全程 + */ + void displayOverview(); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java index b74c5288b4..72feccfefd 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java @@ -194,4 +194,11 @@ public class MogoNavi implements IMogoNavi { mDelegate.stopAimlessMode(); } } + + @Override + public void displayOverview() { + if ( mDelegate != null ) { + mDelegate.displayOverview(); + } + } } 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 3b23e3325b..ed9ec784ae 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 @@ -25,6 +25,7 @@ import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoSearchManager; +import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoRefreshStrategyController; import com.mogo.service.voice.IMogoVoiceListener; import com.mogo.service.voice.IMogoVoiceManager; @@ -52,6 +53,7 @@ public class MapPresenter extends Presenter< MapView > implements private IMogoIntentManager mMogoIntentManager; private IMogoSearchManager mSearchManager; private IMogoRefreshStrategyController mRefreshStrategyController; + private IMogoStatusManager mStatusManager; public MapPresenter( MapView view ) { super( view ); @@ -63,6 +65,7 @@ public class MapPresenter extends Presenter< MapView > implements * opera type为0：0 实时路况开；1实时路况关 type为1：0 放大地图； 1缩小地图 type为2：0切换2d车上； 1切换2d北上；2切换3d车上支持 */ private void initBroadcast() { + // 高德地图免唤醒 broadcastReceiver = new BroadcastReceiver() { @Override public void onReceive( Context context, Intent intent ) { @@ -119,11 +122,12 @@ public class MapPresenter extends Presenter< MapView > implements int extra_is_show = intent.getIntExtra( "EXTRA_IS_SHOW", 0 ); - //if (extra_is_show == 0) { - // mView.getUIController().displayOverview(); - //} else { - // mView.getUIController().recoverLockMode(); - //} + if (extra_is_show == 0) { + mStatusManager.setUserInteractionStatus( TAG, true, false ); + mView.getUIController().displayOverview(); + } else { + mView.getUIController().recoverLockMode(); + } } else if ( key_type == 10005 ) { int navi_route_prefer = intent.getIntExtra( "NAVI_ROUTE_PREFER", type ); @@ -190,6 +194,7 @@ public class MapPresenter extends Presenter< MapView > implements mMogoIntentManager = apis.getIntentManagerApi(); mSearchManager = apis.getSearchManagerApi(); mRefreshStrategyController = apis.getRefreshStrategyControllerApi(); + mStatusManager = apis.getStatusManagerApi(); IMogoNavi mogoNavi = mMogoMapService.getNavi( getContext() ); mogoNavi.setCalculatePathDisplayBounds( new Rect( @@ -324,9 +329,9 @@ public class MapPresenter extends Presenter< MapView > implements AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null ); break; case VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE_UN_WAKEUP: - AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null ); case VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE: - //mView.getUIController().displayOverview(); + AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null ); + mView.getUIController().displayOverview(); break; case VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE_UN_WAKEUP: case VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE: