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

PonyCui · PonyCui · commit bedc91d6d207 · 2017-10-18T17:07:59.000+08:00
# Conflicts:
#	library/src/main/java/com/opensource/svgaplayer/SVGAVideoShapeEntity.kt
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt
@@ -176,6 +176,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
@@ -17,6 +17,8 @@ import java.util.HashMap
  * Created by cuiminghui on 2017/2/22.
  */
 
+val sharedPath = Path()
+
 class SVGAVideoShapeEntity {
 
     enum class Type {
@@ -76,7 +78,6 @@ class SVGAVideoShapeEntity {
         parseArgs(obj)
         parseStyles(obj)
         parseTransform(obj)
-        buildPath()
     }
 
     val isKeep: Boolean
@@ -247,11 +248,15 @@ class SVGAVideoShapeEntity {
         }
     }
 
-    private fun buildPath() {
-        val aPath = Path()
+
+    fun buildPath() {
+        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) {
@@ -263,7 +268,7 @@ class SVGAVideoShapeEntity {
             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
@@ -276,9 +281,10 @@ class SVGAVideoShapeEntity {
             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)
     }
 
 }
diff --git a/readme.md b/readme.md
@@ -1,5 +1,7 @@
 # SVGAPlayer
 
+[![](https://jitpack.io/v/yyued/SVGAPlayer-Android.svg)](https://jitpack.io/#yyued/SVGAPlayer-Android)
+
 ## Version
 
 ### 2.0.0
@@ -39,7 +41,7 @@ allprojects {
 
 add dependency to build.gradle (Final Release https://jitpack.io/#yyued/SVGAPlayer-Android/ )
 ```
-compile 'com.github.yyued:SVGAPlayer-Android:1.2.7'
+compile 'com.github.yyued:SVGAPlayer-Android:1.2.10'
 compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.1"
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE`
`176`	`176`	`sharedContentTransform.preConcat(sprite.frameEntity.transform)`
`177`	`177`	`sprite.frameEntity.shapes.forEach { shape ->`
`178`	`178`	`sharedPath.reset()`
	`179`	`+ shape.buildPath()`
`179`	`180`	`shape.shapePath?.let {`
`180`	`181`	`sharedPath.addPath(it)`
`181`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ import java.util.HashMap`
`17`	`17`	`* Created by cuiminghui on 2017/2/22.`
`18`	`18`	`*/`
`19`	`19`
	`20`	`+val sharedPath = Path()`
	`21`	`+`
`20`	`22`	`class SVGAVideoShapeEntity {`
`21`	`23`
`22`	`24`	`enum class Type {`
`@@ -76,7 +78,6 @@ class SVGAVideoShapeEntity {`
`76`	`78`	`parseArgs(obj)`
`77`	`79`	`parseStyles(obj)`
`78`	`80`	`parseTransform(obj)`
`79`		`- buildPath()`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`val isKeep: Boolean`
`@@ -247,11 +248,15 @@ class SVGAVideoShapeEntity {`
`247`	`248`	`}`
`248`	`249`	`}`
`249`	`250`
`250`		`- private fun buildPath() {`
`251`		`- val aPath = Path()`
	`251`	`+`
	`252`	`+ fun buildPath() {`
	`253`	`+ if (this.shapePath != null) {`
	`254`	`+ return`
	`255`	`+ }`
	`256`	`+ sharedPath.reset()`
`252`	`257`	`if (this.type == SVGAVideoShapeEntity.Type.shape) {`
`253`	`258`	`(this.args?.get("d") as? String)?.let {`
`254`		`- SVGAPath(it).buildPath(aPath)`
	`259`	`+ SVGAPath(it).buildPath(sharedPath)`
`255`	`260`	`}`
`256`	`261`	`}`
`257`	`262`	`else if (this.type == SVGAVideoShapeEntity.Type.ellipse) {`
`@@ -263,7 +268,7 @@ class SVGAVideoShapeEntity {`
`263`	`268`	`val y = yv.toFloat()`
`264`	`269`	`val rx = rxv.toFloat()`
`265`	`270`	`val ry = ryv.toFloat()`
`266`		`- aPath.addOval(RectF(x - rx, y - ry, x + rx, y + ry), Path.Direction.CW)`
	`271`	`+ sharedPath.addOval(RectF(x - rx, y - ry, x + rx, y + ry), Path.Direction.CW)`
`267`	`272`	`}`
`268`	`273`	`else if (this.type == SVGAVideoShapeEntity.Type.rect) {`
`269`	`274`	`val xv = this.args?.get("x") as? Number ?: return`
`@@ -276,9 +281,10 @@ class SVGAVideoShapeEntity {`
`276`	`281`	`val width = wv.toFloat()`
`277`	`282`	`val height = hv.toFloat()`
`278`	`283`	`val cornerRadius = crv.toFloat()`
`279`		`- aPath.addRoundRect(RectF(x, y, x + width, y + height), cornerRadius, cornerRadius, Path.Direction.CW)`
	`284`	`+ sharedPath.addRoundRect(RectF(x, y, x + width, y + height), cornerRadius, cornerRadius, Path.Direction.CW)`
`280`	`285`	`}`
`281`		`- this.shapePath = aPath`
	`286`	`+ this.shapePath = Path()`
	`287`	`+ this.shapePath?.addPath(sharedPath)`
`282`	`288`	`}`
`283`	`289`
`284`	`290`	`}`