Merge remote-tracking branch 'GH/master' into 1.5.0

PonyCui · PonyCui · commit 5de7cc54c7ad · 2017-10-16T15:55:48.000+08:00
# Conflicts:
#	library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt
@@ -12,6 +12,7 @@ class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE
 
     private val sharedPaint = Paint()
     private val sharedPath = Path()
+    private val sharedPath2 = Path()
     private val sharedContentTransform = Matrix()
 
     override fun drawFrame(frameIndex: Int, scaleType: ImageView.ScaleType) {
@@ -191,15 +192,31 @@ class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE
                         sharedPaint.color = it
                         sharedPaint.alpha = (sprite.frameEntity.alpha * 255).toInt()
                         sharedPaint.isAntiAlias = true
+                        if (sprite.frameEntity.maskPath !== null) canvas.save()
+                        sprite.frameEntity.maskPath?.let { maskPath ->
+                            sharedPath2.reset()
+                            maskPath.buildPath(sharedPath2)
+                            sharedPath2.transform(this.sharedContentTransform)
+                            canvas.clipPath(sharedPath2)
+                        }
                         canvas.drawPath(sharedPath, sharedPaint)
+                        if (sprite.frameEntity.maskPath !== null) canvas.restore()
                     }
                 }
                 shape.styles?.strokeWidth?.let {
                     if (it > 0) {
                         sharedPaint.reset()
                         sharedPaint.alpha = (sprite.frameEntity.alpha * 255).toInt()
                         resetShapeStrokePaint(shape)
+                        if (sprite.frameEntity.maskPath !== null) canvas.save()
+                        sprite.frameEntity.maskPath?.let { maskPath ->
+                            sharedPath2.reset()
+                            maskPath.buildPath(sharedPath2)
+                            sharedPath2.transform(this.sharedContentTransform)
+                            canvas.clipPath(sharedPath2)
+                        }
                         canvas.drawPath(sharedPath, sharedPaint)
+                        if (sprite.frameEntity.maskPath !== null) canvas.restore()
                     }
                 }
             }
