fix: correct image key.

svga · Jun 17, 2019 · b8a85db · b8a85db
1 parent c4d71e8
commit b8a85db
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/...c/main/assets/01_VectorColorArea_1.x.svga → app/src/main/assets/matteBitmap.svga b/...c/main/assets/01_VectorColorArea_1.x.svga → app/src/main/assets/matteBitmap.svga
diff --git a/...c/main/assets/02_BitmapColorArea_1.x.svga → app/src/main/assets/matteBitmap_1.x.svga b/...c/main/assets/02_BitmapColorArea_1.x.svga → app/src/main/assets/matteBitmap_1.x.svga
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAVideoEntity.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAVideoEntity.kt
@@ -91,18 +91,19 @@ class SVGAVideoEntity {
                 options.inPreferredConfig = Bitmap.Config.RGB_565
                 var filePath = cacheDir.absolutePath + "/" + imgObjects[imageKey]
                 var bitmap = if (File(filePath).exists()) BitmapFactory.decodeFile(filePath, options) else null
+                val bitmapKey = imageKey.replace(".matte", "")
                 if (bitmap != null) {
-                    images.put(imageKey, bitmap)
+                    images.put(bitmapKey, bitmap)
                 } else {
                     // bitmap.matte : bitmap
                     var filePath = cacheDir.absolutePath + "/" + imgObjects[imageKey] + ".png"
                     var bitmap = if (File(filePath).exists()) BitmapFactory.decodeFile(filePath, options) else null
                     if (bitmap != null) {
-                        images.put(imageKey, bitmap)
+                        images.put(bitmapKey, bitmap)
                     } else {
                         (cacheDir.absolutePath + "/" + imageKey + ".png").takeIf { File(it).exists() }?.let {
                             BitmapFactory.decodeFile(it, options)?.let {
-                                images.put(imageKey, it)
+                                images.put(bitmapKey, it)
                             }
                         }
                     }

diff --git a/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt
@@ -123,7 +123,8 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG
         val imageKey = sprite.imageKey ?: return
         val isHidden = dynamicItem.dynamicHidden[imageKey] == true
         if (isHidden) { return }
-        val drawingBitmap = (dynamicItem.dynamicImage[imageKey] ?: videoItem.images[imageKey]) ?: return
+        val bitmapKey = imageKey.replace(".matte", "")
+        val drawingBitmap = (dynamicItem.dynamicImage[bitmapKey] ?: videoItem.images[bitmapKey]) ?: return
         val frameMatrix = shareFrameMatrix(sprite.frameEntity.transform)
         val paint = this.sharedValues.sharedPaint()
         paint.isAntiAlias = videoItem.antiAlias