From 67acdc7a03677680c4b1e2d88ca4ce0d7d7c6ae5 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 25 Mar 2020 10:53:45 +0800 Subject: [PATCH] opt --- .../com/mogo/module/map/MapPresenter.java | 25 ++++++++----------- .../src/main/res/values-ldpi/dimens.xml | 7 ++++++ .../src/main/res/values-xhdpi/dimens.xml | 7 ++++++ .../src/main/res/values/dimens.xml | 7 ++++++ 4 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml create mode 100644 modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml create mode 100644 modules/mogo-module-map/src/main/res/values/dimens.xml 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 71014b83f0..f5f51f3a35 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 @@ -17,6 +17,7 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoModulePaths; +import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; @@ -155,24 +156,18 @@ public class MapPresenter extends Presenter implements @Override public void onCreate(@NonNull LifecycleOwner owner) { super.onCreate(owner); - mMogoMapService = (IMogoMapService) ARouter.getInstance() - .build(MogoServicePaths.PATH_SERVICES_MAP) - .navigation(getContext()); - mMogoIntentManager = (IMogoIntentManager) ARouter.getInstance() - .build(MogoServicePaths.PATH_INTENT_MANAGER) - .navigation(getContext()); - mSearchManager = (IMogoSearchManager) ARouter.getInstance() - .build(MogoServicePaths.PATH_SEARCH_MANAGER) - .navigation(getContext()); + + IMogoServiceApis apis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation( getContext() ); + mMogoMapService = apis.getMapServiceApi(); + mMogoIntentManager = apis.getIntentManagerApi(); + mSearchManager = apis.getSearchManagerApi(); IMogoNavi mogoNavi = mMogoMapService.getNavi(getContext()); mogoNavi.setCalculatePathDisplayBounds(new Rect( - ResourcesHelper.getDimensionPixelSize(getContext(), R.dimen.dp_730) - + WindowUtils.dip2px(getContext(), 80), - ResourcesHelper.getDimensionPixelSize(getContext(), R.dimen.dp_120) - + WindowUtils.dip2px(getContext(), 80), - WindowUtils.dip2px(getContext(), 80), - WindowUtils.dip2px(getContext(), 80) + ResourcesHelper.getDimensionPixelSize(getContext(), R.dimen.module_map_display_overview_left_margin), + ResourcesHelper.getDimensionPixelSize(getContext(), R.dimen.module_map_display_overview_top_margin), + ResourcesHelper.getDimensionPixelSize(getContext(), R.dimen.module_map_display_overview_right_margin), + ResourcesHelper.getDimensionPixelSize(getContext(), R.dimen.module_map_display_overview_bottom_margin) )); } diff --git a/modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..7f51191319 --- /dev/null +++ b/modules/mogo-module-map/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,7 @@ + + + 558px + 174px + 32px + 80px + \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..275b7ffcd1 --- /dev/null +++ b/modules/mogo-module-map/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,7 @@ + + + 977px + 249px + 61px + 80px + \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/res/values/dimens.xml b/modules/mogo-module-map/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..275b7ffcd1 --- /dev/null +++ b/modules/mogo-module-map/src/main/res/values/dimens.xml @@ -0,0 +1,7 @@ + + + 977px + 249px + 61px + 80px + \ No newline at end of file