xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Android MapView: add onDestroy method

Browse Source
This commit is contained in:
Emux 2017-02-13 10:14:53 +02:00
parent ac115b1f0f
commit 735acc520a
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vtm-android-example/src/org/oscim/android/test/MapActivity.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2016 devemux86 * Copyright 2016-2017 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -61,9 +61,16 @@ public class MapActivity extends Activity {
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause();
mMapView.onPause();
mPrefs.save(mMapView.map()); mPrefs.save(mMapView.map());
mMapView.onPause();
super.onPause();
}
@Override
protected void onDestroy() {
mMapView.onDestroy();
super.onDestroy();
} }
} }

6
vtm-android/src/org/oscim/android/MapView.java
View File

@ -1,6 +1,6 @@
/* /*
* Copyright 2012 Hannes Janetzek * Copyright 2012 Hannes Janetzek
* Copyright 2016 devemux86 * Copyright 2016-2017 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -104,8 +104,8 @@ public class MapView extends GLSurfaceView {
mMotionEvent = new AndroidMotionEvent(); mMotionEvent = new AndroidMotionEvent();
} }
public void onStop() { public void onDestroy() {
mMap.destroy();
} }
public void onPause() { public void onPause() {

11
vtm-app/src/org/oscim/app/MapActivity.java
View File

@ -1,6 +1,7 @@
/* /*
* Copyright 2010, 2011, 2012 mapsforge.org * Copyright 2010, 2011, 2012 mapsforge.org
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2017 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -60,14 +61,12 @@ public abstract class MapActivity extends Activity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
mMapView.onDestroy();
super.onDestroy(); super.onDestroy();
mMap.destroy();
} }
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause();
Editor editor = getSharedPreferences(PREFERENCES_FILE, MODE_PRIVATE).edit(); Editor editor = getSharedPreferences(PREFERENCES_FILE, MODE_PRIVATE).edit();
editor.clear(); editor.clear();
@ -82,7 +81,9 @@ public abstract class MapActivity extends Activity {
editor.putInt(KEY_LONGITUDE, geoPoint.longitudeE6); editor.putInt(KEY_LONGITUDE, geoPoint.longitudeE6);
editor.putFloat(KEY_MAP_SCALE, (float) mapPosition.scale); editor.putFloat(KEY_MAP_SCALE, (float) mapPosition.scale);
editor.commit(); editor.apply();
super.onPause();
} }
@Override @Override
@ -93,8 +94,8 @@ public abstract class MapActivity extends Activity {
@Override @Override
protected void onStop() { protected void onStop() {
super.onStop();
mMapView.onPause(); mMapView.onPause();
super.onStop();
} }
/** /**