From cd31b1b4d61612ea6e2f25d424dbd54c0b34d2e9 Mon Sep 17 00:00:00 2001 From: PonyCui Date: Wed, 16 Jan 2019 16:00:16 +0800 Subject: [PATCH] fix: Remove unnecessary code. --- .../opensource/svgaplayer/SVGAImageView.kt | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt index e8c6627a..d0edde01 100644 --- a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt +++ b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt @@ -63,27 +63,13 @@ open class SVGAImageView : ImageView { } } - private var detachedDrawable: WeakReference? = null - override fun onDetachedFromWindow() { super.onDetachedFromWindow() - this.drawable?.let { - this.detachedDrawable = WeakReference(it) - } - this.setImageDrawable(null) animator?.cancel() animator?.removeAllListeners() animator?.removeAllUpdateListeners() } - override fun onAttachedToWindow() { - super.onAttachedToWindow() - this.detachedDrawable?.get()?.let { - this.setImageDrawable(it) - this.detachedDrawable = null - } - } - private fun loadAttrs(attrs: AttributeSet) { val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0) loops = typedArray.getInt(R.styleable.SVGAImageView_loopCount, 0) @@ -213,12 +199,16 @@ open class SVGAImageView : ImageView { } } - fun setVideoItem(videoItem: SVGAVideoEntity) { + fun setVideoItem(videoItem: SVGAVideoEntity?) { setVideoItem(videoItem, SVGADynamicEntity()) } - fun setVideoItem(videoItem: SVGAVideoEntity, dynamicItem: SVGADynamicEntity) { - val drawable = SVGADrawable(videoItem, dynamicItem) + fun setVideoItem(videoItem: SVGAVideoEntity?, dynamicItem: SVGADynamicEntity?) { + if (videoItem == null) { + setImageDrawable(null) + return + } + val drawable = SVGADrawable(videoItem, dynamicItem ?: SVGADynamicEntity()) drawable.cleared = clearsAfterStop setImageDrawable(drawable) }