lazy buildPath.

PonyCui · PonyCui · commit cc733f6fc177 · 2017-10-18T16:48:18.000+08:00
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt
@@ -181,6 +181,7 @@ class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE
         sharedContentTransform.preConcat(sprite.frameEntity.transform)
         sprite.frameEntity.shapes.forEach { shape ->
             sharedPath.reset()
+            shape.buildPath()
             shape.shapePath?.let {
                 sharedPath.addPath(it)
             }
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAVideoShapeEntity.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAVideoShapeEntity.kt
@@ -16,6 +16,8 @@ import java.util.HashMap
  * Created by cuiminghui on 2017/2/22.
  */
 
+val sharedPath = Path()
+
 class SVGAVideoShapeEntity(obj: JSONObject) {
 
     enum class Type {
@@ -67,7 +69,6 @@ class SVGAVideoShapeEntity(obj: JSONObject) {
         parseArgs(obj)
         parseStyles(obj)
         parseTransform(obj)
-        buildPath()
     }
 
     val isKeep: Boolean
@@ -155,10 +156,13 @@ class SVGAVideoShapeEntity(obj: JSONObject) {
     }
 
     fun buildPath() {
-        val aPath = Path()
+        if (this.shapePath != null) {
+            return
+        }
+        sharedPath.reset()
         if (this.type == SVGAVideoShapeEntity.Type.shape) {
             (this.args?.get("d") as? String)?.let {
-                SVGAPath(it).buildPath(aPath)
+                SVGAPath(it).buildPath(sharedPath)
             }
         }
         else if (this.type == SVGAVideoShapeEntity.Type.ellipse) {
@@ -170,7 +174,7 @@ class SVGAVideoShapeEntity(obj: JSONObject) {
             val y = yv.toFloat()
             val rx = rxv.toFloat()
             val ry = ryv.toFloat()
-            aPath.addOval(RectF(x - rx, y - ry, x + rx, y + ry), Path.Direction.CW)
+            sharedPath.addOval(RectF(x - rx, y - ry, x + rx, y + ry), Path.Direction.CW)
         }
         else if (this.type == SVGAVideoShapeEntity.Type.rect) {
             val xv = this.args?.get("x") as? Number ?: return
@@ -183,9 +187,10 @@ class SVGAVideoShapeEntity(obj: JSONObject) {
             val width = wv.toFloat()
             val height = hv.toFloat()
             val cornerRadius = crv.toFloat()
-            aPath.addRoundRect(RectF(x, y, x + width, y + height), cornerRadius, cornerRadius, Path.Direction.CW)
+            sharedPath.addRoundRect(RectF(x, y, x + width, y + height), cornerRadius, cornerRadius, Path.Direction.CW)
         }
-        this.shapePath = aPath
+        this.shapePath = Path()
+        this.shapePath?.addPath(sharedPath)
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE`
`181`	`181`	`sharedContentTransform.preConcat(sprite.frameEntity.transform)`
`182`	`182`	`sprite.frameEntity.shapes.forEach { shape ->`
`183`	`183`	`sharedPath.reset()`
	`184`	`+ shape.buildPath()`
`184`	`185`	`shape.shapePath?.let {`
`185`	`186`	`sharedPath.addPath(it)`
`186`	`187`	`}`