sshhsun-code
diff --git a/‎app/src/main/assets/EmptyState_JSON.svga
-34.5 KB b/‎app/src/main/assets/EmptyState_JSON.svga
-34.5 KB
diff --git a/‎app/src/main/assets/angel.svga
-89.1 KB b/‎app/src/main/assets/angel.svga
-89.1 KB
diff --git a/‎library/src/main/java/com/opensource/svgaplayer/SVGADynamicEntity.kt
Lines changed: 25 additions & 0 deletions b/‎library/src/main/java/com/opensource/svgaplayer/SVGADynamicEntity.kt
Lines changed: 25 additions & 0 deletions
diff --git a/‎library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt
Lines changed: 6 additions & 5 deletions b/‎library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt
Lines changed: 6 additions & 5 deletions
diff --git a/‎library/src/main/java/com/opensource/svgaplayer/SVGAParser.kt
Lines changed: 1 addition & 1 deletion b/‎library/src/main/java/com/opensource/svgaplayer/SVGAParser.kt
Lines changed: 1 addition & 1 deletion
@@ -1,7 +1,13 @@
 package com.opensource.svgaplayer
 
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.text.TextPaint
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.logging.Handler
 
 /**
  * Created by cuiminghui on 2017/3/30.
@@ -18,6 +24,25 @@ class SVGADynamicEntity {
         this.dynamicImage.put(forKey, bitmap)
     }
 
+    fun setDynamicImage(url: String, forKey: String) {
+        val handler = android.os.Handler()
+        Thread({
+            try {
+                (URL(url).openConnection() as? HttpURLConnection)?.let {
+                    it.connectTimeout = 20 * 1000
+                    it.requestMethod = "GET"
+                    it.connect()
+                    BitmapFactory.decodeStream(it.inputStream)?.let {
+                        handler.post { setDynamicImage(it, forKey) }
+                    }
+                    it.inputStream.close()
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }).start()
+    }
+
     fun setDynamicText(text: String, textPaint: TextPaint, forKey: String) {
         this.dynamicText.put(forKey, text)
         this.dynamicTextPaint.put(forKey, textPaint)
 
@@ -6,6 +6,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.ColorFilter
+import android.graphics.PixelFormat
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.text.TextPaint
@@ -46,7 +47,7 @@ class SVGADrawable(val videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE
 
     var scaleType: ImageView.ScaleType = ImageView.ScaleType.MATRIX
 
-    internal val drawer = SVGACanvasDrawer(videoItem, dynamicItem)
+    private val drawer = SVGACanvasDrawer(videoItem, dynamicItem)
 
     override fun draw(canvas: Canvas?) {
         if (cleared) {
@@ -61,7 +62,7 @@ class SVGADrawable(val videoItem: SVGAVideoEntity, val dynamicItem: SVGADynamicE
     override fun setAlpha(alpha: Int) { }
 
     override fun getOpacity(): Int {
-        return 255
+        return PixelFormat.TRANSPARENT
     }
 
     override fun setColorFilter(colorFilter: ColorFilter?) {
@@ -121,7 +122,7 @@ open class SVGAImageView : ImageView {
         animator?.removeAllUpdateListeners()
     }
 
-    fun loadAttrs(attrs: AttributeSet) {
+    private fun loadAttrs(attrs: AttributeSet) {
         val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0)
         loops = typedArray.getInt(R.styleable.SVGAImageView_loopCount, 0)
         clearsAfterStop = typedArray.getBoolean(R.styleable.SVGAImageView_clearsAfterStop, true)
@@ -161,10 +162,10 @@ open class SVGAImageView : ImageView {
             }).start()
         }
         typedArray.getString(R.styleable.SVGAImageView_fillMode)?.let {
-            if (it.equals("0")) {
+            if (it == "0") {
                 fillMode = FillMode.Backward
             }
-            else if (it.equals("1")) {
+            else if (it == "1") {
                 fillMode = FillMode.Forward
             }
         }
 
@@ -109,7 +109,7 @@ class SVGAParser(private val context: Context) {
         }).start()
     }
 
-    private fun parse(inputStream: InputStream, cacheKey: String): SVGAVideoEntity? {
+    fun parse(inputStream: InputStream, cacheKey: String): SVGAVideoEntity? {
         val bytes = readAsBytes(inputStream)
         if (bytes.size > 4 && bytes[0].toInt() == 80 && bytes[1].toInt() == 75 && bytes[2].toInt() == 3 && bytes[3].toInt() == 4) {
             synchronized(sharedLock, {
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class SVGAParser(private val context: Context) {`
`109`	`109`	`}).start()`
`110`	`110`	`}`
`111`	`111`
`112`		`- private fun parse(inputStream: InputStream, cacheKey: String): SVGAVideoEntity? {`
	`112`	`+ fun parse(inputStream: InputStream, cacheKey: String): SVGAVideoEntity? {`
`113`	`113`	`val bytes = readAsBytes(inputStream)`
`114`	`114`	`if (bytes.size > 4 && bytes[0].toInt() == 80 && bytes[1].toInt() == 75 && bytes[2].toInt() == 3 && bytes[3].toInt() == 4) {`
`115`	`115`	`synchronized(sharedLock, {`