Cherry pick release (#9263)

* [core] - bump earcut version dependency to handle  unused lamba warning (#9242)

* [android] - snapshot bitmap contains view based content (#9252)
This commit is contained in:
Tobrun
2017-06-14 14:34:03 +02:00
committed by GitHub
parent 0c275ad6fa
commit 7bfcce0266
3 changed files with 46 additions and 5 deletions

View File

@@ -29,6 +29,7 @@ import com.mapbox.mapboxsdk.style.layers.Layer;
import com.mapbox.mapboxsdk.style.light.Light;
import com.mapbox.mapboxsdk.style.sources.CannotAddSourceException;
import com.mapbox.mapboxsdk.style.sources.Source;
import com.mapbox.mapboxsdk.utils.BitmapUtils;
import com.mapbox.services.commons.geojson.Feature;
import java.nio.ByteBuffer;
@@ -39,7 +40,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
import timber.log.Timber;
// Class that wraps the native methods for convenience
final class NativeMapView {
@@ -920,12 +920,20 @@ final class NativeMapView {
}
protected void onFpsChanged(double fps) {
if (isDestroyedOn("OnFpsChanged")) {
return;
}
mapView.onFpsChanged(fps);
}
protected void onSnapshotReady(Bitmap bitmap) {
if (snapshotReadyCallback != null && bitmap != null) {
snapshotReadyCallback.onSnapshotReady(bitmap);
protected void onSnapshotReady(Bitmap mapContent) {
if (isDestroyedOn("OnSnapshotReady")) {
return;
}
Bitmap viewContent = BitmapUtils.createBitmapFromView(mapView);
if (snapshotReadyCallback != null && mapContent != null && viewContent != null) {
snapshotReadyCallback.onSnapshotReady(BitmapUtils.mergeBitmap(mapContent, viewContent));
}
}

View File

@@ -0,0 +1,33 @@
package com.mapbox.mapboxsdk.utils;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.support.annotation.NonNull;
import android.view.View;
public class BitmapUtils {
public static Bitmap createBitmapFromView(@NonNull View view) {
view.setDrawingCacheEnabled(true);
view.setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_LOW);
view.buildDrawingCache();
if (view.getDrawingCache() == null) {
return null;
}
Bitmap snapshot = Bitmap.createBitmap(view.getDrawingCache());
view.setDrawingCacheEnabled(false);
view.destroyDrawingCache();
return snapshot;
}
public static Bitmap mergeBitmap(@NonNull Bitmap background, @NonNull Bitmap foreground) {
Bitmap result = Bitmap.createBitmap(background.getWidth(), background.getHeight(), background.getConfig());
Canvas canvas = new Canvas(result);
canvas.drawBitmap(background, 0f, 0f, null);
canvas.drawBitmap(foreground, 10, 10, null);
return result;
}
}