From 714b974db25b085f3fd80807fbc160fd2a1d6dfe Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sun, 12 Jan 2020 09:46:00 +0800 Subject: [PATCH] opt --- .../mogo/map/impl/amap/navi/NaviClient.java | 8 ++++++++ .../impl/amap/navi/NaviListenerAdapter.java | 7 +++++++ .../map/impl/amap/navi/NaviOverlayHelper.java | 17 ++++++++++------- .../java/com/mogo/map/navi/IMogoNavi.java | 9 +++++++++ .../main/res/drawable-xhdpi/ic_navi_start.png | Bin 0 -> 4444 bytes .../res/drawable-xhdpi/ic_navi_target.png | Bin 0 -> 3751 bytes .../src/main/java/com/mogo/map/MogoNavi.java | 8 ++++++++ .../module/apps/AppNavigatorFragment.java | 18 ++++++------------ .../module_apps_ic_car_settings.png | Bin 0 -> 16041 bytes .../module_apps_ic_media_center.png | Bin 0 -> 13291 bytes .../module_apps_fragment_apps_navigator.xml | 8 ++++---- .../com/mogo/module/map/MapPresenter.java | 13 ++++++++++++- .../module/service/MogoServiceProvider.java | 1 + 13 files changed, 65 insertions(+), 24 deletions(-) create mode 100755 libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_navi_start.png create mode 100755 libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_navi_target.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_car_settings.png create mode 100644 modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_media_center.png 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 da5143003f..549e0bda92 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 @@ -1,6 +1,7 @@ package com.mogo.map.impl.amap.navi; import android.content.Context; +import android.graphics.Rect; import com.amap.api.maps.model.Polyline; import com.amap.api.navi.AMapNavi; @@ -170,6 +171,13 @@ public class NaviClient implements IMogoNavi { } } + @Override + public void setCalculatePathDisplayBounds( Rect bounds ) { + if ( mAMapNaviListener != null ) { + mAMapNaviListener.setCalculatePathDisplayBounds(bounds); + } + } + // -- end private boolean checkAMapNavi() { 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 2693c8381c..33d0adeeca 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 @@ -1,6 +1,7 @@ package com.mogo.map.impl.amap.navi; import android.content.Context; +import android.graphics.Rect; import com.amap.api.maps.model.Polyline; import com.amap.api.navi.AMapNavi; @@ -185,4 +186,10 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { mNaviOverlayHelper.clearCalculatedOverlay(); } } + + public void setCalculatePathDisplayBounds( Rect bounds ){ + if ( mNaviOverlayHelper != null ) { + mNaviOverlayHelper.setCalculatePathDisplayBounds(bounds); + } + } } 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 5bed8c3c71..a8ef6433d6 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 @@ -58,7 +58,7 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction { private int mSelectedPathId; private CalculatePathItem mSelectedCalculatePathItem; - private SoftReference< OnCalculatePathItemClickInteraction > mLineClickInteractionRef; + private OnCalculatePathItemClickInteraction mLineClickInteraction; public NaviOverlayHelper( AMapNavi mAMapNavi, AMap mAMap, Context mContext ) { this.mAMapNavi = mAMapNavi; @@ -157,7 +157,7 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction { if ( i == 0 ) { mSelectedPathId = item.getId(); mSelectedCalculatePathItem = item; - wrapper.setStartBitmap( R.drawable.ic_search_poi_location ).setEndBitmap( R.drawable.ic_search_choice_point ); + wrapper.setStartBitmap( R.drawable.ic_navi_start ).setEndBitmap( R.drawable.ic_navi_target ); mAMapNavi.selectRouteId( item.getId() ); } wrapper.addToMap(); @@ -196,8 +196,8 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction { if ( mPaths != null && !mPaths.isEmpty() ) { for ( MogoCalculatePath path : mPaths ) { if ( TextUtils.equals( path.getTagId(), polyline.getId() ) ) { - if ( mLineClickInteractionRef != null && mLineClickInteractionRef.get() != null ) { - mLineClickInteractionRef.get().onItemClicked( path.getTagId() ); + if ( mLineClickInteraction != null ) { + mLineClickInteraction.onItemClicked( path.getTagId() ); break; } } @@ -317,9 +317,12 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction { } public void setLineClickInteraction( OnCalculatePathItemClickInteraction lineClickInteraction ) { - if ( mLineClickInteractionRef != null ) { - mLineClickInteractionRef.clear(); + mLineClickInteraction = lineClickInteraction; + } + + public void setCalculatePathDisplayBounds( Rect bounds ) { + if ( bounds != null ) { + mBoundRect = bounds; } - mLineClickInteractionRef = new SoftReference<>( lineClickInteraction ); } } 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 85626c4231..e2db3a9e9f 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 @@ -1,5 +1,7 @@ package com.mogo.map.navi; +import android.graphics.Rect; + import com.mogo.map.MogoLatLng; import java.util.List; @@ -95,4 +97,11 @@ public interface IMogoNavi { */ void clearCalculatePaths(); + /** + * 设置显示规划路线的范围 + * + * @param bounds 范围 + */ + void setCalculatePathDisplayBounds( Rect bounds ); + } diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_navi_start.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_navi_start.png new file mode 100755 index 0000000000000000000000000000000000000000..5c5430c62ee0e2b22a79e77bd14fd42cc01e836e GIT binary patch literal 4444 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 > implements IView { private View mNavigation; - private View mMusic; - private View mChat; + private View mMediaCenter; + private View mCarSettings; private View mApps; - private IMogoCardManager mCardManager; - private AppsFragment mAppsFragment; private IMogoFragmentManager mMogoFragmentManager; @@ -49,23 +46,20 @@ public class AppNavigatorFragment extends MvpFragment< IView, Presenter< IView > @Override protected void initViews() { - mCardManager = ( IMogoCardManager ) ARouter.getInstance().build( MogoServicePaths.PATH_CARD_MANAGER ).navigation( getContext() ); mMogoFragmentManager = ( IMogoFragmentManager ) ARouter.getInstance().build( MogoServicePaths.PATH_FRAGMENT_MANAGER ).navigation(); mNavigation = findViewById( R.id.module_apps_id_navigation ); - mMusic = findViewById( R.id.module_apps_id_music ); - mChat = findViewById( R.id.module_apps_id_chat ); + mMediaCenter = findViewById( R.id.module_apps_ic_media_center ); + mCarSettings = findViewById( R.id.module_apps_ic_car_settings ); mApps = findViewById( R.id.module_apps_id_apps ); mNavigation.setOnClickListener( view -> { mSearchProvider = ( IMogoModuleProvider ) ARouter.getInstance().build( MogoModulePaths.PATH_MODULE_SEARCH ).navigation(); final Fragment fragment = mSearchProvider.createFragment( getContext(), null ); mMogoFragmentManager.push( new FragmentDescriptor.Builder().fragment( fragment ).tag( MogoModulePaths.PATH_FRAGMENT_SEARCH ).notifyMainModule( true ).build() ); } ); - mMusic.setOnClickListener( view -> { - mCardManager.switch2( "CARD_TYPE_SHARE_MUSIC" ); + mMediaCenter.setOnClickListener( view -> { } ); - mChat.setOnClickListener( view -> { - mCardManager.switch2( "CARD_TYPE_CARS_CHATTING" ); + mCarSettings.setOnClickListener( view -> { } ); mApps.setOnClickListener( view -> { mAppsFragment = new AppsFragment(); diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_car_settings.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_car_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..bb7ed874fb009398cc43267cdc7176dfa4eb31f8 GIT binary patch literal 16041 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_media_center.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_media_center.png new file mode 100644 index 0000000000000000000000000000000000000000..13aa66438ac86c6901e792ba449aebaa5d07f3cc GIT binary patch literal 13291 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml index 01f080cb69..4c773f62bf 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml @@ -13,18 +13,18 @@ android:src="@drawable/module_apps_ic_navigation" /> + android:src="@drawable/module_apps_ic_media_center" /> + android:src="@drawable/module_apps_ic_car_settings" /> implements IMogoVoiceList super.onCreate( owner ); mMogoMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( getContext() ); registerUnWakeupCmd(); + + 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 ) + ) ); } private void registerUnWakeupCmd() { @@ -157,7 +168,7 @@ public class MapPresenter extends Presenter< MapView > implements IMogoVoiceList mView.getUIController().changeMapMode( EnumMapUI.Type_Night ); } else if ( action == 1 ) { mView.getUIController().changeMapMode( EnumMapUI.Type_Light ); - } else if( action == 2){ + } else if ( action == 2 ) { mView.getUIController().changeMapMode( EnumMapUI.Type_AUTO_LIGHT_Night ); } break; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index 0613de5866..99f408481d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -220,6 +220,7 @@ public class MogoServiceProvider implements IMogoModuleProvider, mUiController = mMogoMapService.getMapUIController(); mStatusManager = ( IMogoStatusManager ) ARouter.getInstance().build( MogoServicePaths.PATH_STATUS_MANAGER ).navigation( context ); mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.USER_INTERACTED, this ); + mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.SEARCH_UI, this ); //TODO 初始化地图地图绘制大而全的Marker MarkerServiceHandler.init( mContext );