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

TileCache: dont use ParcelFileDescriptor for now, cleanups

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-19 22:42:50 +01:00
parent 2fa0a53fdd
commit 5b3c2ed1a8
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vtm-android/src/org/oscim/android/cache/TileCache.java vendored
View File

@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDoneException; import android.database.sqlite.SQLiteDoneException;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
@ -108,9 +107,14 @@ public class TileCache implements ITileCache {
mDatabase.close(); mDatabase.close();
} }
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public TileCache(Context context, String cacheDirectory, String dbName) { public TileCache(Context context, String cacheDirectory, String dbName) {
dbHelper = new SQLiteHelper(context); dbHelper = new SQLiteHelper(context);
if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN)
dbHelper.setWriteAheadLoggingEnabled(true);
mDatabase = dbHelper.getWritableDatabase(); mDatabase = dbHelper.getWritableDatabase();
mStmtGetTile = mDatabase.compileStatement("" + mStmtGetTile = mDatabase.compileStatement("" +
@ -154,7 +158,7 @@ public class TileCache implements ITileCache {
class SQLiteHelper extends SQLiteOpenHelper { class SQLiteHelper extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "tile.db"; private static final String DATABASE_NAME = "tile.db";
private static final int DATABASE_VERSION = 3; private static final int DATABASE_VERSION = 8;
private static final String DATABASE_CREATE = private static final String DATABASE_CREATE =
"CREATE TABLE " "CREATE TABLE "
@ -209,13 +213,12 @@ public class TileCache implements ITileCache {
mStmtPutTile.bindBlob(6, bytes); mStmtPutTile.bindBlob(6, bytes);
mStmtPutTile.execute(); mStmtPutTile.execute();
mStmtPutTile.clearBindings(); mStmtPutTile.clearBindings();
} }
} }
@TargetApi(Build.VERSION_CODES.HONEYCOMB) @TargetApi(Build.VERSION_CODES.HONEYCOMB)
public synchronized TileReader getTileApi11(Tile tile) { public TileReader getTileApi11(Tile tile) {
InputStream in = null; InputStream in = null;
mStmtGetTile.bindLong(1, tile.tileX); mStmtGetTile.bindLong(1, tile.tileX);
@ -242,8 +245,8 @@ public class TileCache implements ITileCache {
@Override @Override
public synchronized TileReader getTile(Tile tile) { public synchronized TileReader getTile(Tile tile) {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) //if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
return getTileApi11(tile); // return getTileApi11(tile);
mQueryVals[0] = String.valueOf(tile.zoomLevel); mQueryVals[0] = String.valueOf(tile.zoomLevel);
mQueryVals[1] = String.valueOf(tile.tileX); mQueryVals[1] = String.valueOf(tile.tileX);
@ -268,12 +271,7 @@ public class TileCache implements ITileCache {
return new CacheTileReader(tile, in, Integer.MAX_VALUE); return new CacheTileReader(tile, in, Integer.MAX_VALUE);
} }
public SQLiteDatabase open() throws SQLException {
return dbHelper.getWritableDatabase();
}
@Override @Override
public void setCacheSize(long size) { public void setCacheSize(long size) {
// TODO Auto-generated method stub
} }
} }