add fun startAnimation(range: SVGARange?, reverse: Boolean = false)

PonyCui · PonyCui · commit ba6eed677160 · 2017-12-29T15:54:37.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt
@@ -172,12 +172,18 @@ open class SVGAImageView : ImageView {
     }
 
     fun startAnimation() {
+        startAnimation(null, false)
+    }
+
+    fun startAnimation(range: SVGARange?, reverse: Boolean = false) {
         val drawable = drawable as? SVGADrawable ?: return
         drawable.cleared = false
         drawable.scaleType = scaleType
         drawable.videoItem?.let {
             var durationScale = 1.0
-            val animator = ValueAnimator.ofInt(0, it.frames - 1)
+            val startFrame = Math.max(0, range?.location ?: 0)
+            val endFrame = Math.min(it.frames - 1, ((range?.location ?: 0) + (range?.length ?: Int.MAX_VALUE) - 1))
+            val animator = ValueAnimator.ofInt(startFrame, endFrame)
             try {
                 Class.forName("android.animation.ValueAnimator")?.let {
                     it.getDeclaredField("sDurationScale")?.let {
@@ -189,7 +195,7 @@ open class SVGAImageView : ImageView {
                 }
             } catch (e: Exception) {}
             animator.interpolator = LinearInterpolator()
-            animator.duration = (it.frames * (1000 / it.FPS) / durationScale).toLong()
+            animator.duration = ((endFrame - startFrame + 1) * (1000 / it.FPS) / durationScale).toLong()
             animator.repeatCount = if (loops <= 0) 99999 else loops - 1
             animator.addUpdateListener {
                 drawable.currentFrame = animator.animatedValue as Int
@@ -204,7 +210,10 @@ open class SVGAImageView : ImageView {
                     stopAnimation()
                     if (!clearsAfterStop) {
                         if (fillMode == FillMode.Backward) {
-                            drawable.currentFrame = 0
+                            drawable.currentFrame = startFrame
+                        }
+                        else if (fillMode == FillMode.Forward) {
+                            drawable.currentFrame = endFrame
                         }
                     }
                     callback?.onFinished()
@@ -216,7 +225,12 @@ open class SVGAImageView : ImageView {
                     isAnimating = true
                 }
             })
-            animator.start()
+            if (reverse) {
+                animator.reverse()
+            }
+            else {
+                animator.start()
+            }
             this.animator = animator
         }
     }
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAStructs.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAStructs.kt
@@ -6,4 +6,6 @@ package com.opensource.svgaplayer
 
 class SVGAPoint(val x: Float, val y: Float, val value: Float)
 
-class SVGARect(val x: Double, val y: Double, val width: Double, val height: Double)
+class SVGARect(val x: Double, val y: Double, val width: Double, val height: Double)
+
+class SVGARange(val location: Int, val length: Int)
diff --git a/readme.md b/readme.md
@@ -149,6 +149,7 @@ HttpResponseCache.install(cacheDir, 1024 * 1024 * 128)
 
 ### Methods
 * startAnimation() - Play Animation from 0 frame.
+* startAnimation(range: SVGARange?, reverse: Boolean = false) - Play Animation in [location, location + length] range, and reverse or not.
 * pauseAnimation() - Pause Animation and keep on current frame.
 * stopAnimation() - Stop Animation，Clears Canvas while clearsAfterStop == YES.
 * stepToFrame(int frame, boolean andPlay) - Step to N frame, and then Play Animation if andPlay === true.

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.0.0'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.0.1'`
`11`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`