use clipPath instead of BitmapShader.

PonyCui · PonyCui · commit cb33d6f08abc · 2017-10-23T11:30:54.000+08:00
set SoftwareLayer while API &lt; 18.
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/SVGACanvasDrawer.kt
@@ -120,14 +120,11 @@ class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE
             if (sprite.frameEntity.maskPath != null) {
                 val maskPath = sprite.frameEntity.maskPath ?: return@let
                 canvas.save()
-                canvas.concat(sharedContentTransform)
-                canvas.clipRect(0, 0, it.width, it.height)
-                val bitmapShader = BitmapShader(it, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT)
-                sharedPaint.shader = bitmapShader
-                sharedPaint.isAntiAlias = true
                 sharedPath.reset()
                 maskPath.buildPath(sharedPath)
-                canvas.drawPath(sharedPath, sharedPaint)
+                sharedPath.transform(sharedContentTransform)
+                canvas.clipPath(sharedPath)
+                canvas.drawBitmap(it, sharedContentTransform, sharedPaint)
                 canvas.restore()
             }
             else {
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt
@@ -7,9 +7,11 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.ColorFilter
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.text.TextPaint
 import android.util.AttributeSet
 import android.view.Choreographer
+import android.view.View
 import android.view.ViewPropertyAnimator
 import android.view.animation.LinearInterpolator
 import android.widget.ImageView
@@ -83,20 +85,31 @@ open class SVGAImageView : ImageView {
 
     private var animator: ValueAnimator? = null
 
-    constructor(context: Context?) : super(context) {}
+    constructor(context: Context?) : super(context) {
+        setSoftwareLayerType()
+    }
 
     constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
+        setSoftwareLayerType()
         attrs?.let { loadAttrs(it) }
     }
 
     constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        setSoftwareLayerType()
         attrs?.let { loadAttrs(it) }
     }
 
     constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        setSoftwareLayerType()
         attrs?.let { loadAttrs(it) }
     }
 
+    private fun setSoftwareLayerType() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            this.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        }
+    }
+
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         animator?.cancel()
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAPath.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAPath.kt
@@ -3,10 +3,11 @@ package com.opensource.svgaplayer
 import android.graphics.Path
 import java.util.*
 
-class SVGAPath(val strValue: String) {
+val VALID_METHODS: List<String> = listOf("M", "L", "H", "V", "C", "S", "Q", "R", "A", "Z", "m", "l", "h", "v", "c", "s", "q", "r", "a", "z")
 
-    var cachedPath: Path? = null
-    val VALID_METHODS: List<String> = listOf("M", "L", "H", "V", "C", "S", "Q", "R", "A", "Z", "m", "l", "h", "v", "c", "s", "q", "r", "a", "z")
+class SVGAPath(private val strValue: String) {
+
+    private var cachedPath: Path? = null
 
     fun buildPath(toPath: Path) {
         cachedPath?.let {
@@ -32,15 +33,15 @@ class SVGAPath(val strValue: String) {
                 currentMethod = firstLetter
                 argLast = item.substring(1)
             } else {
-                if (null != argLast && argLast.trim { it <= ' ' }.length > 0) {
+                argLast = if (null != argLast && argLast.trim { it <= ' ' }.isNotEmpty()) {
                     args.add(SVGAPoint(try {
                         argLast.toFloat()
                     } catch (e: Exception) {0.0f}, try {
                         item.toFloat()
                     } catch (e: Exception) {0.0f}, 0.0f))
-                    argLast = null
+                    null
                 } else {
-                    argLast = item
+                    item
                 }
             }
         }
