Merge pull request svga#10 from Labmem003/master

PonyCui · web-flow · commit 1c5b199e80bf · 2017-11-13T10:02:04.000+08:00
bug-fix:image scale should be doing after clip mask path，or mask scope will be narrowed erroneously
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt
@@ -155,18 +155,19 @@ class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE
             sharedPaint.alpha = (sprite.frameEntity.alpha * 255).toInt()
             performScaleType(scaleType)
             sharedContentTransform.preConcat(sprite.frameEntity.transform)
-            sharedContentTransform.preScale((sprite.frameEntity.layout.width / it.width).toFloat(), (sprite.frameEntity.layout.width / it.width).toFloat())
             if (sprite.frameEntity.maskPath != null) {
                 val maskPath = sprite.frameEntity.maskPath ?: return@let
                 canvas.save()
                 sharedPath.reset()
                 maskPath.buildPath(sharedPath)
                 sharedPath.transform(sharedContentTransform)
                 canvas.clipPath(sharedPath)
+                sharedContentTransform.preScale((sprite.frameEntity.layout.width / it.width).toFloat(), (sprite.frameEntity.layout.width / it.width).toFloat())
                 canvas.drawBitmap(it, sharedContentTransform, sharedPaint)
                 canvas.restore()
             }
             else {
+                sharedContentTransform.preScale((sprite.frameEntity.layout.width / it.width).toFloat(), (sprite.frameEntity.layout.width / it.width).toFloat())
                 canvas.drawBitmap(it, sharedContentTransform, sharedPaint)
             }
             drawText(it, sprite)
