Merge remote-tracking branch 'origin/master'
This commit is contained in:
Weblate
commit
bc91884716
2 changed files with 6 additions and 307 deletions
|
|
@ -1,301 +0,0 @@
|
|||
package net.osmand.core.android;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import net.osmand.core.jni.BoolPtr;
|
||||
import net.osmand.core.jni.interface_ICoreResourcesProvider;
|
||||
import net.osmand.core.jni.SWIGTYPE_p_QByteArray;
|
||||
import net.osmand.core.jni.SWIGTYPE_p_bool;
|
||||
import net.osmand.core.jni.SwigUtilities;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.util.Algorithms;
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.content.res.AssetFileDescriptor;
|
||||
import android.content.res.AssetManager;
|
||||
import android.os.Build;
|
||||
import android.util.Log;
|
||||
|
||||
// This class provides reverse mapping from 'embed-resources.list' to files&folders scheme used by OsmAndCore_android.aar package
|
||||
@TargetApi(Build.VERSION_CODES.GINGERBREAD)
|
||||
public class CoreResourcesFromAndroidAssetsCustom extends interface_ICoreResourcesProvider {
|
||||
private static final String TAG = "CoreResFromAndAssets";
|
||||
private static final String NATIVE_TAG = "CoreResFromAndAssets";
|
||||
|
||||
private CoreResourcesFromAndroidAssetsCustom(final Context context) {
|
||||
_context = context;
|
||||
}
|
||||
|
||||
private boolean load() {
|
||||
final AssetManager assetManager = _context.getResources().getAssets();
|
||||
|
||||
PackageInfo packageInfo = null;
|
||||
try {
|
||||
packageInfo = _context.getPackageManager().getPackageInfo(_context.getPackageName(), 0);
|
||||
} catch (NameNotFoundException e) {
|
||||
Log.e(TAG, "Failed to get own package info", e);
|
||||
return false;
|
||||
}
|
||||
_bundleFilename = packageInfo.applicationInfo.sourceDir;
|
||||
Log.i(TAG, "Located own package at '" + _bundleFilename + "'");
|
||||
|
||||
// Load the index
|
||||
final List<String> resourcesInBundle = new LinkedList<String>();
|
||||
try {
|
||||
final InputStream resourcesIndexStream = assetManager.open("OsmAndCore_ResourcesBundle.index",
|
||||
AssetManager.ACCESS_BUFFER);
|
||||
|
||||
final BufferedReader resourcesIndexBufferedReader = new BufferedReader(new InputStreamReader(
|
||||
resourcesIndexStream));
|
||||
String resourceInBundle;
|
||||
while ((resourceInBundle = resourcesIndexBufferedReader.readLine()) != null)
|
||||
resourcesInBundle.add(resourceInBundle);
|
||||
} catch (IOException e) {
|
||||
Log.e(TAG, "Failed to read bundle index", e);
|
||||
return false;
|
||||
}
|
||||
Log.i(TAG, "Application contains " + resourcesInBundle.size() + " resources");
|
||||
|
||||
// Parse resources index
|
||||
final Pattern resourceNameWithQualifiersRegExp = Pattern.compile("(?:\\[(.*)\\]/)(.*)");
|
||||
for (String resourceInBundle : resourcesInBundle) {
|
||||
// Process resource name
|
||||
String pureResourceName = resourceInBundle;
|
||||
String[] qualifiers = null;
|
||||
final Matcher resourceNameComponentsMatcher = resourceNameWithQualifiersRegExp.matcher(resourceInBundle);
|
||||
if (resourceNameComponentsMatcher.matches()) {
|
||||
qualifiers = resourceNameComponentsMatcher.group(1).split(";");
|
||||
pureResourceName = resourceNameComponentsMatcher.group(2);
|
||||
}
|
||||
|
||||
// Get location of this resource
|
||||
final String path = "OsmAndCore_ResourcesBundle/" + resourceInBundle + (resourceInBundle.endsWith(".png") ? "" : ".qz");
|
||||
final File extractedPath = ((OsmandApplication) _context.getApplicationContext()).getAppPath(path);
|
||||
final ResourceData resourceData = new ResourceData();
|
||||
if (!extractedPath.exists()) {
|
||||
try {
|
||||
final AssetFileDescriptor resourceFd = assetManager.openFd(path);
|
||||
long declaredSize = resourceFd.getDeclaredLength();
|
||||
resourceData.size = resourceFd.getLength();
|
||||
resourceData.offset = resourceFd.getStartOffset();
|
||||
resourceData.path = new File(_bundleFilename);
|
||||
resourceFd.close();
|
||||
if (declaredSize != resourceData.size) {
|
||||
Log.e(NATIVE_TAG, "Declared size does not match size for '" + resourceInBundle + "'");
|
||||
continue;
|
||||
}
|
||||
} catch (FileNotFoundException e) {
|
||||
try {
|
||||
final File containgDir = extractedPath.getParentFile();
|
||||
if (containgDir != null && !containgDir.exists())
|
||||
containgDir.mkdirs();
|
||||
extractedPath.createNewFile();
|
||||
|
||||
final InputStream resourceStream = assetManager.open(path, AssetManager.ACCESS_STREAMING);
|
||||
final FileOutputStream fileStream = new FileOutputStream(extractedPath);
|
||||
Algorithms.streamCopy(resourceStream, fileStream);
|
||||
Algorithms.closeStream(fileStream);
|
||||
Algorithms.closeStream(resourceStream);
|
||||
} catch (IOException e2) {
|
||||
if (extractedPath.exists())
|
||||
extractedPath.delete();
|
||||
|
||||
Log.e(NATIVE_TAG, "Failed to extract '" + resourceInBundle + "'", e2);
|
||||
continue;
|
||||
}
|
||||
resourceData.offset = 0;
|
||||
resourceData.path = extractedPath;
|
||||
resourceData.size = resourceData.path.length();
|
||||
} catch (IOException e) {
|
||||
Log.e(NATIVE_TAG, "Failed to locate '" + resourceInBundle + "'", e);
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
resourceData.offset = 0;
|
||||
resourceData.path = extractedPath;
|
||||
resourceData.size = resourceData.path.length();
|
||||
}
|
||||
|
||||
// Get resource entry for this resource
|
||||
ResourceEntry resourceEntry = _resources.get(pureResourceName);
|
||||
if (resourceEntry == null) {
|
||||
resourceEntry = new ResourceEntry();
|
||||
_resources.put(pureResourceName, resourceEntry);
|
||||
}
|
||||
if (qualifiers == null) {
|
||||
resourceEntry.defaultVariant = resourceData;
|
||||
} else {
|
||||
for (String qualifier : qualifiers) {
|
||||
final String[] qualifierComponents = qualifier.trim().split("=");
|
||||
|
||||
if (qualifierComponents.length == 2 && qualifierComponents[0].equals("ddf")) {
|
||||
float ddfValue;
|
||||
try {
|
||||
ddfValue = Float.parseFloat(qualifierComponents[1]);
|
||||
} catch (NumberFormatException e) {
|
||||
Log.e(TAG, "Unsupported value '" + qualifierComponents[1] + "' for DDF qualifier", e);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (resourceEntry.variantsByDisplayDensityFactor == null)
|
||||
resourceEntry.variantsByDisplayDensityFactor = new TreeMap<Float, ResourceData>();
|
||||
resourceEntry.variantsByDisplayDensityFactor.put(ddfValue, resourceData);
|
||||
} else {
|
||||
Log.w(TAG, "Unsupported qualifier '" + qualifier.trim() + "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private final Context _context;
|
||||
private String _bundleFilename;
|
||||
private final HashMap<String, ResourceEntry> _resources = new HashMap<String, ResourceEntry>();
|
||||
|
||||
private final class ResourceData {
|
||||
public File path;
|
||||
public long offset;
|
||||
public long size;
|
||||
}
|
||||
|
||||
private final class ResourceEntry {
|
||||
public ResourceData defaultVariant;
|
||||
public TreeMap<Float, ResourceData> variantsByDisplayDensityFactor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SWIGTYPE_p_QByteArray getResource(String name, float displayDensityFactor, SWIGTYPE_p_bool ok_) {
|
||||
final BoolPtr ok = BoolPtr.frompointer(ok_);
|
||||
|
||||
final ResourceEntry resourceEntry = _resources.get(name);
|
||||
if (resourceEntry == null || resourceEntry.variantsByDisplayDensityFactor == null) {
|
||||
Log.w(TAG, "Requested resource [ddf=" + displayDensityFactor + "]'" + name + "' was not found");
|
||||
if (ok != null)
|
||||
ok.assign(false);
|
||||
return SwigUtilities.emptyQByteArray();
|
||||
}
|
||||
|
||||
Map.Entry<Float, ResourceData> resourceDataEntry = resourceEntry.variantsByDisplayDensityFactor
|
||||
.ceilingEntry(displayDensityFactor);
|
||||
if (resourceDataEntry == null)
|
||||
resourceDataEntry = resourceEntry.variantsByDisplayDensityFactor.lastEntry();
|
||||
ResourceData resourceData = resourceDataEntry.getValue();
|
||||
Log.d(TAG, "Using ddf=" + resourceDataEntry.getKey() + " while looking for " + displayDensityFactor + " of '"
|
||||
+ name + "'");
|
||||
System.out.println(resourceData.path.getAbsolutePath());
|
||||
final SWIGTYPE_p_QByteArray data;
|
||||
final String dataPath = resourceData.path.getAbsolutePath();
|
||||
if (resourceData.offset == 0 && resourceData.size == resourceData.path.length()) {
|
||||
if (dataPath.endsWith(".qz")) {
|
||||
data = SwigUtilities.qDecompress(SwigUtilities.readEntireFile(dataPath));
|
||||
} else {
|
||||
data = SwigUtilities.readEntireFile(dataPath);
|
||||
}
|
||||
} else {
|
||||
data = SwigUtilities.qDecompress(SwigUtilities.readPartOfFile(dataPath,
|
||||
resourceData.offset, resourceData.size));
|
||||
}
|
||||
if (data == null) {
|
||||
Log.e(TAG, "Failed to load data of '" + name + "'");
|
||||
if (ok != null)
|
||||
ok.assign(false);
|
||||
return SwigUtilities.emptyQByteArray();
|
||||
}
|
||||
|
||||
if (ok != null)
|
||||
ok.assign(true);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SWIGTYPE_p_QByteArray getResource(String name, SWIGTYPE_p_bool ok_) {
|
||||
final BoolPtr ok = BoolPtr.frompointer(ok_);
|
||||
|
||||
final ResourceEntry resourceEntry = _resources.get(name);
|
||||
if (resourceEntry == null) {
|
||||
Log.w(TAG, "Requested resource '" + name + "' was not found");
|
||||
if (ok != null)
|
||||
ok.assign(false);
|
||||
return SwigUtilities.emptyQByteArray();
|
||||
}
|
||||
|
||||
if (resourceEntry.defaultVariant == null) {
|
||||
Log.w(TAG, "Requested resource '" + name + "' was not found");
|
||||
if (ok != null)
|
||||
ok.assign(false);
|
||||
return SwigUtilities.emptyQByteArray();
|
||||
}
|
||||
System.out.println(resourceEntry.defaultVariant.path.getAbsolutePath());
|
||||
final SWIGTYPE_p_QByteArray data;
|
||||
final String dataPath = resourceEntry.defaultVariant.path.getAbsolutePath();
|
||||
if (resourceEntry.defaultVariant.offset == 0
|
||||
&& resourceEntry.defaultVariant.size == resourceEntry.defaultVariant.path.length()) {
|
||||
if (dataPath.endsWith(".qz")) {
|
||||
data = SwigUtilities.qDecompress(SwigUtilities.readEntireFile(dataPath));
|
||||
} else {
|
||||
data = SwigUtilities.readEntireFile(dataPath);
|
||||
}
|
||||
} else {
|
||||
data = SwigUtilities.qDecompress(SwigUtilities.readPartOfFile(dataPath,
|
||||
resourceEntry.defaultVariant.offset, resourceEntry.defaultVariant.size));
|
||||
}
|
||||
if (data == null) {
|
||||
Log.e(TAG, "Failed to load data of '" + name + "'");
|
||||
if (ok != null)
|
||||
ok.assign(false);
|
||||
return SwigUtilities.emptyQByteArray();
|
||||
}
|
||||
|
||||
if (ok != null)
|
||||
ok.assign(true);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsResource(String name, float displayDensityFactor) {
|
||||
final ResourceEntry resourceEntry = _resources.get(name);
|
||||
if (resourceEntry == null || resourceEntry.variantsByDisplayDensityFactor == null)
|
||||
return false;
|
||||
|
||||
// If there's variant for any DDF, it will be used
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsResource(String name) {
|
||||
final ResourceEntry resourceEntry = _resources.get(name);
|
||||
if (resourceEntry == null)
|
||||
return false;
|
||||
|
||||
if (resourceEntry.defaultVariant == null)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public static CoreResourcesFromAndroidAssetsCustom loadFromCurrentApplication(final Context context) {
|
||||
final CoreResourcesFromAndroidAssetsCustom bundle = new CoreResourcesFromAndroidAssetsCustom(context);
|
||||
|
||||
if (!bundle.load())
|
||||
return null;
|
||||
|
||||
return bundle;
|
||||
}
|
||||
}
|
||||
|
|
@ -2,12 +2,8 @@ package net.osmand.plus.views.corenative;
|
|||
|
||||
import java.io.File;
|
||||
|
||||
import android.content.Context;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.util.Log;
|
||||
import android.view.WindowManager;
|
||||
import net.osmand.IndexConstants;
|
||||
import net.osmand.core.android.CoreResourcesFromAndroidAssetsCustom;
|
||||
import net.osmand.core.android.CoreResourcesFromAndroidAssets;
|
||||
import net.osmand.core.android.MapRendererContext;
|
||||
import net.osmand.core.android.NativeCore;
|
||||
import net.osmand.core.jni.Logger;
|
||||
|
|
@ -17,6 +13,10 @@ import net.osmand.core.jni.QIODeviceLogSink;
|
|||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.srtmplugin.SRTMPlugin;
|
||||
import android.content.Context;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.util.Log;
|
||||
import android.view.WindowManager;
|
||||
|
||||
/**
|
||||
* Created by Denis on 01.10.2014.
|
||||
|
|
@ -47,7 +47,7 @@ public class NativeCoreContext {
|
|||
public static void init(OsmandApplication app) {
|
||||
if (!init && NativeCore.isAvailable()) {
|
||||
if (!NativeCore.isLoaded())
|
||||
NativeCore.load(CoreResourcesFromAndroidAssetsCustom.loadFromCurrentApplication(app));
|
||||
NativeCore.load(CoreResourcesFromAndroidAssets.loadFromCurrentApplication(app));
|
||||
if (NativeCore.isLoaded()) {
|
||||
|
||||
File directory = app.getAppPath("");
|
||||
|
|
|
|||
Loading…
Reference in a new issue