Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user