fix: support reuse bitmap paint and canvas.

svga · Jun 18, 2019 · 3df95bb · 3df95bb
1 parent b8a85db
commit 3df95bb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/app/src/main/assets/Goddess.svga b/app/src/main/assets/Goddess.svga
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
@@ -19,6 +19,7 @@
 public class AnimationFromAssetsActivity extends Activity {
 
     SVGAImageView animationView = null;
+    int currentIndex = 0;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -28,7 +29,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         animationView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                loadAnimation();
+                animationView.stepToFrame(currentIndex++, false);
             }
         });
         loadAnimation();
@@ -41,7 +42,7 @@ private void loadAnimation() {
             @Override
             public void onComplete(@NotNull SVGAVideoEntity videoItem) {
                 animationView.setVideoItem(videoItem);
-                animationView.startAnimation();
+                animationView.stepToFrame(0, true);
             }
             @Override
             public void onError() {

diff --git a/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt
@@ -51,13 +51,9 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG
                     isMatteing = false
 
                     matteSprites.get(svgaDrawerSprite.matteKey)?.let {
-                        val matteBitmap = Bitmap.createBitmap(canvas.width, canvas.height, Bitmap.Config.ARGB_8888)
-                        val matteCanvas = Canvas(matteBitmap)
-                        val paint = Paint()
-                        paint.setXfermode(PorterDuffXfermode(PorterDuff.Mode.DST_IN))
+                        drawSprite(it, this.sharedValues.shareMatteCanvas(canvas.width, canvas.height), frameIndex)
 
-                        drawSprite(it, matteCanvas, frameIndex)
-                        canvas.drawBitmap(matteBitmap, 0f, 0f, paint)
+                        canvas.drawBitmap(this.sharedValues.sharedMatteBitmap(), 0f, 0f, this.sharedValues.shareMattePaint())
                         canvas.restore()
                     }
                 }
@@ -72,13 +68,9 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG
             // if current sprite is the last one and isMatteing
             if (isMatteing && index == sprites.count() - 1) {
                 matteSprites.get(svgaDrawerSprite.matteKey)?.let {
-                    val matteBitmap = Bitmap.createBitmap(canvas.width, canvas.height, Bitmap.Config.ARGB_8888)
-                    val matteCanvas = Canvas(matteBitmap)
-                    val paint = Paint()
-                    paint.setXfermode(PorterDuffXfermode(PorterDuff.Mode.DST_IN))
+                    drawSprite(it, this.sharedValues.shareMatteCanvas(canvas.width, canvas.height), frameIndex)
 
-                    drawSprite(it, matteCanvas, frameIndex)
-                    canvas.drawBitmap(matteBitmap, 0f, 0f, paint)
+                    canvas.drawBitmap(this.sharedValues.sharedMatteBitmap(), 0f, 0f, this.sharedValues.shareMattePaint())
                     canvas.restore()
                 }
             }
@@ -344,6 +336,10 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG
         private val sharedMatrix = Matrix()
         private val sharedMatrix2 = Matrix()
 
+        private val shareMattePaint = Paint()
+        private var shareMatteCanvas: Canvas? = null
+        private var sharedMatteBitmap: Bitmap? = null
+
         fun sharedPaint(): Paint {
             sharedPaint.reset()
             return sharedPaint
@@ -369,6 +365,24 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG
             return sharedMatrix2
         }
 
+        fun shareMattePaint(): Paint {
+            shareMattePaint.setXfermode(PorterDuffXfermode(PorterDuff.Mode.DST_IN))
+            return shareMattePaint
+        }
+
+        fun sharedMatteBitmap(): Bitmap {
+            return sharedMatteBitmap as Bitmap
+        }
+
+        fun shareMatteCanvas(width: Int, height: Int): Canvas {
+            if (shareMatteCanvas == null) {
+                sharedMatteBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ALPHA_8)
+                shareMatteCanvas = Canvas(sharedMatteBitmap)
+            }
+            val matteCanvas = shareMatteCanvas as Canvas
+            matteCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+            return matteCanvas
+        }
     }
 
     class PathCache {