Fix bitmap leak.

Xigong93 · Dec 14, 2021 · f0c611b · f0c611b
1 parent cae086b
commit f0c611b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/app/src/main/java/pokercc/android/boxshadowlayout/demo/AnimationActivity.kt b/app/src/main/java/pokercc/android/boxshadowlayout/demo/AnimationActivity.kt
@@ -68,7 +68,7 @@ class AnimationActivity : AppCompatActivity() {
             Dp(0f).toPx().toFloat(),
             Dp(20f).toPx().toFloat()
         )
-        anim?.cancel()
+        cancelAnim()
         val animatorSet = AnimatorSet()
         anim = animatorSet
         animatorSet.duration = 2000
@@ -89,12 +89,20 @@ class AnimationActivity : AppCompatActivity() {
         super.onStart()
         anim?.resume()
     }
+
     override fun onPause() {
         super.onPause()
         anim?.pause()
     }
+
     override fun onDestroy() {
         super.onDestroy()
+        cancelAnim()
+    }
+
+    private fun cancelAnim() {
+        anim?.removeAllListeners()
         anim?.cancel()
+        anim = null
     }
 }
diff --git a/boxShadowLayout/src/main/java/pokercc/android/boxshadowlayout/BitmapShadowDrawable.kt b/boxShadowLayout/src/main/java/pokercc/android/boxshadowlayout/BitmapShadowDrawable.kt
@@ -71,5 +71,9 @@ internal abstract class BitmapShadowDrawable(shadowPath: Path) : ShadowDrawable(
 
     abstract fun onDrawBitmap(bitmap: Bitmap)
 
+    override fun release() {
+        bitmap?.recycle()
+        bitmap = null
+    }
 
 }
diff --git a/boxShadowLayout/src/main/java/pokercc/android/boxshadowlayout/BoxShadowLayout.kt b/boxShadowLayout/src/main/java/pokercc/android/boxshadowlayout/BoxShadowLayout.kt
@@ -104,6 +104,11 @@ class BoxShadowLayout @JvmOverloads constructor(
         tellParentNotChip()
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        shadowDrawable.release()
+    }
+
     override fun draw(canvas: Canvas) {
         drawShadow(canvas)
         val saveCount = canvas.saveLayer(null, null)

diff --git a/boxShadowLayout/src/main/java/pokercc/android/boxshadowlayout/ShadowDrawable.kt b/boxShadowLayout/src/main/java/pokercc/android/boxshadowlayout/ShadowDrawable.kt
@@ -42,5 +42,5 @@ internal abstract class ShadowDrawable(protected val shadowPath: Path) : Drawabl
     open fun invalidateCache() = Unit
 
     abstract fun onShadowChange(blur: Float, color: Int, inset: Boolean)
-
+    open fun release() = Unit
 }