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

do not block in AsyncTask

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-04 11:29:07 +02:00
parent 6a259855af
commit 8299423e6d
1 changed files with 73 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/org/oscim/renderer/layers/TextRenderLayer.java
View File

@ -54,17 +54,18 @@ import org.oscim.view.MapViewPosition;
import android.opengl.GLES20;
import android.os.AsyncTask;
import android.os.SystemClock;
import android.util.Log;
import android.os.Handler;
import android.os.Looper;
public class TextRenderLayer extends BasicRenderLayer {
private final static String TAG = TextRenderLayer.class.getName();
private final static float MIN_CAPTION_DIST = 5;
private final static float MIN_WAY_DIST = 3;
private final static long MAX_RELABEL_DELAY = 200;
private final MapViewPosition mMapViewPosition;
private final TileSet mTileSet;
//private final LabelThread mThread;
private MapPosition mTmpPos;
@ -128,13 +129,6 @@ public class TextRenderLayer extends BasicRenderLayer {
public int active;
public OBB2D bbox;
public TextItem move(TextItem ti, float dx, float dy) {
this.x = dx + ti.x;
this.y = dy + ti.y;
return this;
}
public TextItem move(TextItem ti, float dx, float dy, float scale) {
this.x = (dx + ti.x) * scale;
this.y = (dy + ti.y) * scale;
@ -162,51 +156,9 @@ public class TextRenderLayer extends BasicRenderLayer {
// Label labels;
// }
/* package */boolean mRun;
class LabelTask extends AsyncTask<Void, Void, Integer> {
@Override
protected Integer doInBackground(Void... params) {
SystemClock.sleep(100);
if (!isCancelled() && updateLabels())
return null;
return Integer.valueOf(1);
}
@Override
protected void onPostExecute(Integer result) {
if (result == null)
mMapView.render();
if (mRun) {
mRun = false;
mLabelTask = new LabelTask();
mLabelTask.execute((Void) null);
} else{
mLabelTask = null;
}
}
@Override
protected void onCancelled() {
cleanup();
}
}
void cleanup() {
mPool.releaseAll(mPrevLabels);
mPrevLabels = null;
mTileSet.clear();
mLabelTask = null;
mRun = false;
}
private float mSquareRadius;
private int mRelabelCnt;
private final TileRenderLayer mTileLayer;
/* private */AsyncTask<Void, Void, Integer> mLabelTask;
public TextRenderLayer(MapView mapView, TileRenderLayer baseLayer) {
super(mapView);
@ -713,20 +665,71 @@ public class TextRenderLayer extends BasicRenderLayer {
}
if (!mHolding)
runLabelTask();
postLabelTask((mLastRun + MAX_RELABEL_DELAY) - System.currentTimeMillis());
}
private void runLabelTask() {
if (mRun)
return;
/* private */LabelTask mLabelTask;
/* private */long mLastRun;
class LabelTask extends AsyncTask<Void, Void, Integer> {
@Override
protected Integer doInBackground(Void... unused) {
boolean labelsChanged = false;
if (!isCancelled())
labelsChanged = updateLabels();
if (!isCancelled() && labelsChanged)
mMapView.render();
//Log.d(TAG, "relabel " + labelsChanged);
mLastRun = System.currentTimeMillis();
mLabelTask = null;
return null;
}
@Override
protected void onCancelled() {
cleanup();
}
}
/*private */void cleanup() {
mPool.releaseAll(mPrevLabels);
mPrevLabels = null;
mTileSet.clear();
mLabelTask = null;
}
private final Runnable mLabelUpdate = new Runnable() {
@Override
public void run() {
if (mLabelTask == null) {
mLabelTask = new LabelTask();
mLabelTask.execute((Void) null);
mLabelTask.execute();
} else {
mRun = true;
postLabelTask(50);
//Log.d(TAG, "repost");
}
}
};
private Handler mLabelHandler;
/* private */void postLabelTask(long delay) {
if (mLabelHandler == null) {
mLabelHandler = new Handler(Looper.getMainLooper());
}
mLabelHandler.removeCallbacks(mLabelUpdate);
if (delay > 0)
mLabelHandler.postDelayed(mLabelUpdate, delay);
else
mLabelHandler.post(mLabelUpdate);
}
@Override
public synchronized void render(MapPosition pos, Matrices m) {
@ -766,13 +769,14 @@ public class TextRenderLayer extends BasicRenderLayer {
// runLabelTask();
}
public void clearLabels() {
Log.d(TAG, "clearLabels");
if (mLabelTask != null) {
// FIXME not sure, true?
mLabelTask.cancel(false);
} else {
public synchronized void clearLabels() {
if (mLabelHandler != null)
mLabelHandler.removeCallbacks(mLabelUpdate);
if (mLabelTask == null) {
cleanup();
} else {
mLabelTask.cancel(false);
}
}
}