From 1b4d018a6d879fa75f9573ba688ae809cf321233 Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Wed, 19 Feb 2020 13:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4Map=E7=94=9F=E5=91=BD?= =?UTF-8?q?=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/commons/mvp/MvpFragment.java | 2 ++ .../mogo/map/impl/amap/AMapNaviViewWrapper.java | 9 +++++++-- .../com/mogo/map/impl/amap/navi/NaviClient.java | 2 +- .../map/impl/amap/navi/NaviListenerAdapter.java | 5 +++++ .../src/main/res/drawable-ldpi/ic_endpoint.png | Bin 482 -> 516 bytes .../src/main/res/drawable-xhdpi/ic_endpoint.png | Bin 788 -> 804 bytes .../java/com/mogo/module/main/MainActivity.java | 2 +- .../java/com/mogo/module/map/MapFragment.java | 14 +++++++++++--- 8 files changed, 27 insertions(+), 7 deletions(-) mode change 100755 => 100644 libraries/map-amap/src/main/res/drawable-ldpi/ic_endpoint.png mode change 100755 => 100644 libraries/map-amap/src/main/res/drawable-xhdpi/ic_endpoint.png diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java index b8d49ab8e5..05909364e4 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java @@ -44,6 +44,7 @@ public abstract class MvpFragment< V extends IView, P extends Presenter< V > > e @Override public void onViewCreated( @NonNull View view, @Nullable Bundle savedInstanceState ) { super.onViewCreated( view, savedInstanceState ); + initViews(savedInstanceState); } /** @@ -66,6 +67,7 @@ public abstract class MvpFragment< V extends IView, P extends Presenter< V > > e * presenter 生命周期错乱 */ protected abstract void initViews(); + protected void initViews(Bundle savedInstanceState){} /** * 创建 presenter 实例 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 53971a4967..ba6016ba28 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 @@ -155,6 +155,10 @@ public class AMapNaviViewWrapper implements IMogoMapView, aMap.setOnCameraChangeListener( this ); } AMapMessageManager.getInstance().registerAMapMessageListener( this ); + + + + } private Context getContext() { @@ -414,8 +418,9 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( checkAMapView() ) { mMapView.getMap().setMyLocationEnabled( true ); MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); + style.interval(1000); style.showMyLocation( visible ); - style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); + //style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); style.strokeColor( Color.TRANSPARENT ); style.strokeWidth( 0 ); style.radiusFillColor( Color.TRANSPARENT ); @@ -454,7 +459,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, public void onNaviStarted() { if ( checkAMapView() ) { mMapView.setCarOverlayVisible( true ); - showMyLocation( false ); + //showMyLocation( false ); } } 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 28d812677a..1042809dd3 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 @@ -46,7 +46,7 @@ public class NaviClient implements IMogoNavi { private NaviClient( Context context ) { mAMapNavi = AMapNavi.getInstance( context ); - mAMapNavi.setEmulatorNaviSpeed( 120 ); + //mAMapNavi.setEmulatorNaviSpeed( 120 ); mAMapNavi.setUseInnerVoice( true ); mAMapNaviListener = new NaviListenerAdapter( context, mAMapNavi, this ); mAimlessModeListener = new AimlessModeListenerAdapter() { 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 58178239a4..41f60f1a46 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 @@ -62,6 +62,9 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { mNaviOverlayHelper = new NaviOverlayHelper( mAMapNavi, AMapWrapper.getAMap(), mContext ); } + + + public void setNaviing( boolean mIsNaviing ) { this.mIsNaviing = mIsNaviing; } @@ -90,6 +93,7 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { @Override public void onInitNaviSuccess() { MogoNaviListenerHandler.getInstance().onInitNaviSuccess(); + //mAMapNavi.startAimlessMode(AimLessMode.CAMERA_AND_SPECIALROAD_DETECTED); } @Override @@ -202,6 +206,7 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { @Override public void onLocationChange( AMapNaviLocation aMapNaviLocation ) { super.onLocationChange( aMapNaviLocation ); + Logger.i( TAG, "onLocationChange" +aMapNaviLocation.getCoord().toString()); mNaviOverlayHelper.handlePassedLocation( aMapNaviLocation ); } diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_endpoint.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_endpoint.png old mode 100755 new mode 100644 index 3dc2e6361ceab7f022fefb0946ab737e95a51c66..a1716599df29bbc277ee1ec88b58c2a17cb08282 GIT binary patch literal 516 zcmV+f0{i`mP)Px$zDYzuR5%f>l(9+!K@f&#FNsAEBoGy}QV5ErO+-kdXsK9Q3#RrBEPRa!)|R5! ziCh9=8cR`9SVd5TV3Wd_tn=^P9GmlEPR&4W_jdmIGJ89-L?bpeh*!8d-q4zMHR+-v zJqw*C)l{UaO3`U;b^j_V_8YKxdy?z*Iu(YMq5@=%p|0bk%GH&vrk_Q=G!~)FN$7FVI}t<3F`qbn)^?=dTZ>c?&Q= zokS`xnI?s7w&`b<9ZS<;Zk?7VX2fmArSVC^Z!{Egq=vT8~YN+Yh>T67WO{4J}hKu~9K&DNqN5$6H9HwA*Cy?cL_ z*MTE6(28*d8HNF((Rsmz6CHq}{Rs*mG(op;tXvjBr=Zb$e(RwF4(>1Gw;sm^naTv? zC@u%HWr5<>K%>j{Wj$(y23q^3fiAdh!a;w%V8fh$zkdM-gU88FGGs#l0000Px$oJmAMR5%f>RIy3}K@gqUBo;xCKvd95At)(rB0>_yRH9f~3#RrDEc^rO2-cRO zSSgYO#55^INnsU15e}Oa#@xE^yg8Or<01~+?J@h_+nJr2WBSI5*N3ZG)0QS(V$#!q zXyPstH<;nHM9K7ojO_Y(% zVXGl}i6n2<3)LoYflv_1px+V^Hb-tu%+vbh9L=OZbsu^joju*t>GK_F6LLuQR3cSC zWJx%JbizooBWc>ptPx%-bqA3R9FecSI=wIKoov&vZ$b5v`ASH+lzSeB3Nmydhibr6iSc&I*1^MH}%ki z_9lWL9{kZ`5ftj(gIZgx*o!9-q!nS6vU>3cS~eNyn`CyA$t2Yznh&y@eKYfY-zJmy zUWjT2|Ed0jl;ZKiy+hN!uIvk5uBTfe^2&E*Ap`gzGYEDK#~6v*Ul$Hr_l8#~R@Aq)W?HCr5GMZ~cVhOyQLG@xbT+5nP_ ze$Gua`o?Ad+kYOXz*=zFfEF|n*B@bqOC}j?INbBH00+1dPzgKvYzEl6cOmf|E-ZGh?7z)q0X9$@C({&)i&L zCAD@(agqF$$y|WBlES(W8Bq1y0@7<$Xs`ZAQK=005y8*^nh6WY?N!0a6=@m+i?$dF zOI2`jG09ipj|_+zTMShVg{3UO0WKR-c#ja%2GGN)er_c`2_+R(tt`NiD$hzwYZ?P+ zAko9wVkoJoYDIyyuCfd*)3k=SKq;VsM5(mJP*RJSFy+|hg9fxryxR{TP-{bC9F5G~ zzM9pHmTSqNz>{+$r?Xo!O!?nUX?G7m96;BK?iFssNEM&DEl+jCS}%{jwilDQsajvn i;zs_}%V}Jrmh<0QB3+G9y`3Nc0000WP)Px%&PhZ;R7efQmpy0{Q4q&x-Y!On*Ju`)f20=0QDb$!?#1vYH2y&6Yso}Ko0}Xfkod0@z_x9~u&3z;pcz5sS?aXiA z*UTK#0%TZgH8ypppLB45G;NcXCDPI$TqGv6X<{|Hx9`a0Fmv#CEd7(yhlutR?yjtS zs+4>y5g<(u08HK{Hvz7I;r4+=eG~)N^n(^-eB1*=qD4;vZv0B z?>PFvWsm@Ct$F9p1_c|JVg))~0O?T!oGZbkKaL^*-Md_>c+rO{dkF zI-$N&v}<)Y4M^Lvs*Ac-bcUv-`5*N5dx^%s&d^h7<-m2W^q}~DF9zo$UTwzM)1Xqh z9}Sq_yVvy4$?iVNc4SO-qF?;|jjqp3(UUKQ#26IH^A1IO9)fXt%f<3L`yeT1I4TxAEcRj{6ICFpLD_+Pv impleme private void startLocation() { mLocationClient = mMogoMapService.getSingletonLocationClient( getApplicationContext() ); mLocationClient.addLocationListener( this ); - mLocationClient.start(10_000L); + mLocationClient.start(2_000L); } private void loadContainerModules() { diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java index 66f8b1ae2f..ed7b4fc192 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java @@ -31,7 +31,15 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements @Override protected void initViews() { + //mMogoMapView = findViewById( R.id.module_map_id_map ); + //mMogoMap = mMogoMapView.getMap(); + //mMogoMap.getUIController().showMyLocation( true ); + } + + @Override protected void initViews(Bundle savedInstanceState) { + super.initViews(savedInstanceState); mMogoMapView = findViewById( R.id.module_map_id_map ); + mMogoMapView.onCreate( savedInstanceState ); mMogoMap = mMogoMapView.getMap(); mMogoMap.getUIController().showMyLocation( true ); } @@ -45,9 +53,9 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements @Override public void onActivityCreated( @Nullable Bundle savedInstanceState ) { super.onActivityCreated( savedInstanceState ); - if ( mMogoMapView != null ) { - mMogoMapView.onCreate( savedInstanceState ); - } + //if ( mMogoMapView != null ) { + // mMogoMapView.onCreate( savedInstanceState ); + //} initMapView(); }