From e9b81b4548f0710330373261cea2171a93abe1b3 Mon Sep 17 00:00:00 2001 From: caiyuwei Date: Thu, 8 Oct 2020 18:58:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20matte=20=E5=8C=BA=E5=9F=9F=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svgaplayer/AnimationFromAssetsActivity.java | 17 +++++++++++------ .../svgaplayer/drawer/SVGACanvasDrawer.kt | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/ponycui_home/svgaplayer/AnimationFromAssetsActivity.java b/app/src/main/java/com/example/ponycui_home/svgaplayer/AnimationFromAssetsActivity.java index 0ee76e00..15416d59 100644 --- a/app/src/main/java/com/example/ponycui_home/svgaplayer/AnimationFromAssetsActivity.java +++ b/app/src/main/java/com/example/ponycui_home/svgaplayer/AnimationFromAssetsActivity.java @@ -58,17 +58,22 @@ public void onError() { private String randomSample() { if (samples.size() == 0) { - samples.add("gradientBorder.svga"); - samples.add("Goddess.svga"); - samples.add("Rocket.svga"); - samples.add("angel.svga"); + samples.add("750x80.svga"); samples.add("alarm.svga"); + samples.add("angel.svga"); + samples.add("Castle.svga"); samples.add("EmptyState.svga"); + samples.add("Goddess.svga"); + samples.add("gradientBorder.svga"); samples.add("heartbeat.svga"); + samples.add("matteBitmap.svga"); + samples.add("matteBitmap_1.x.svga"); + samples.add("matteRect.svga"); + samples.add("MerryChristmas.svga"); samples.add("posche.svga"); + samples.add("Rocket.svga"); + samples.add("rose.svga"); samples.add("rose_2.0.0.svga"); - samples.add("Castle.svga"); - samples.add("MerryChristmas.svga"); } return samples.get((int) Math.floor(Math.random() * samples.size())); } diff --git a/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt index 4aa793b8..7f84c26d 100644 --- a/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt +++ b/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt @@ -202,14 +202,14 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG maskPath.buildPath(path) path.transform(frameMatrix) canvas.clipPath(path) - frameMatrix.preScale((sprite.frameEntity.layout.width / drawingBitmap.width).toFloat(), (sprite.frameEntity.layout.width / drawingBitmap.width).toFloat()) + frameMatrix.preScale((sprite.frameEntity.layout.width / drawingBitmap.width).toFloat(), (sprite.frameEntity.layout.height / drawingBitmap.height).toFloat()) if (!drawingBitmap.isRecycled) { canvas.drawBitmap(drawingBitmap, frameMatrix, paint) } canvas.restore() } else { - frameMatrix.preScale((sprite.frameEntity.layout.width / drawingBitmap.width).toFloat(), (sprite.frameEntity.layout.width / drawingBitmap.width).toFloat()) + frameMatrix.preScale((sprite.frameEntity.layout.width / drawingBitmap.width).toFloat(), (sprite.frameEntity.layout.height / drawingBitmap.height).toFloat()) if (!drawingBitmap.isRecycled) { canvas.drawBitmap(drawingBitmap, frameMatrix, paint) }