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..f11faa9c65 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() { @@ -176,6 +180,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( mMapView != null ) { mMapView.onCreate( bundle ); } + Logger.d( TAG, "map onCreate" ); } @Override @@ -183,6 +188,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( mMapView != null ) { mMapView.onResume(); } + Logger.d( TAG, "map onResume" ); } @Override @@ -190,6 +196,8 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( mMapView != null ) { mMapView.onPause(); } + + Logger.d( TAG, "map onPause" ); } @Override @@ -197,6 +205,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( mMapView != null ) { mMapView.onDestroy(); } + Logger.d( TAG, "map onDestroy" ); } @Override @@ -204,10 +213,12 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( mMapView != null ) { mMapView.onSaveInstanceState( outState ); } + Logger.d( TAG, "map onSaveInstanceState" ); } @Override public void onLowMemory() { + Logger.d( TAG, "map onLowMemory" ); } @@ -414,10 +425,12 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( checkAMapView() ) { mMapView.getMap().setMyLocationEnabled( true ); MyLocationStyle style = mMapView.getMap().getMyLocationStyle(); - style.showMyLocation( visible ); style.myLocationType( MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER ); + style.interval(1000); + style.showMyLocation( visible ); style.strokeColor( Color.TRANSPARENT ); style.strokeWidth( 0 ); + style.showMyLocation(visible); style.radiusFillColor( Color.TRANSPARENT ); style.myLocationIcon( BitmapDescriptorFactory.fromResource( R.drawable.map_api_ic_current_location ) ); mMapView.getMap().setMyLocationStyle( style ); @@ -454,7 +467,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..19a020fc79 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() { @@ -131,7 +131,7 @@ public class NaviClient implements IMogoNavi { mAMapNaviListener.stopNavi(); } // 开启巡航 巡航时返回电子眼和特殊道路设施信息 - mAMapNavi.startAimlessMode( AimLessMode.CAMERA_AND_SPECIALROAD_DETECTED ); +// mAMapNavi.startAimlessMode( AimLessMode.CAMERA_AND_SPECIALROAD_DETECTED ); } @@ -143,7 +143,8 @@ public class NaviClient implements IMogoNavi { // 关闭巡航 //mAMapNavi.stopAimlessMode(); mIsRealNavi = isRealNavi; - mAMapNavi.startNavi( isRealNavi ? NaviType.GPS : NaviType.EMULATOR ); + boolean result = mAMapNavi.startNavi( isRealNavi ? NaviType.GPS : NaviType.EMULATOR ); + Logger.d( TAG, "start navi status: %s", result ); } @Override 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 3dc2e6361c..a1716599df Binary files a/libraries/map-amap/src/main/res/drawable-ldpi/ic_endpoint.png and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_endpoint.png differ diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_endpoint.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_endpoint.png old mode 100755 new mode 100644 index fec14b79ff..f178056730 Binary files a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_endpoint.png and b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_endpoint.png differ diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 5d92bd5e76..9290c6c3ab 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -306,7 +306,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > 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(); }