Merge pull request #66 from Petterpx/fix/fx_view_scope_reference

fix:view方式的浮窗取消弱引用

Author: Petterpx

floatingx/src/main/java/com/petterp/floatingx/assist/helper/BasisHelper.kt

@@ -9,7 +9,6 @@ import com.petterp.floatingx.listener.IFxConfigStorage
 import com.petterp.floatingx.listener.IFxScrollListener
 import com.petterp.floatingx.listener.IFxViewLifecycle
 import com.petterp.floatingx.util.FxLog
-import java.lang.ref.WeakReference
 import kotlin.math.abs
 
 /** 通用构建器helper */
@@ -18,7 +17,7 @@ open class BasisHelper {
     internal var layoutId: Int = 0
 
     @JvmField
-    internal var layoutView: WeakReference<View>? = null
+    internal var layoutView: View? = null
 
     @JvmField
     internal var gravity: FxGravity = FxGravity.DEFAULT
@@ -104,12 +103,19 @@ open class BasisHelper {
         if (enableDebugLog) fxLog = FxLog.builder("$scope$fxLogTag")
     }
 
+    @JvmSynthetic
+    internal fun clear() {
+        layoutView = null
+        enableFx = false
+        fxAnimation?.cancelAnimation()
+    }
+
     abstract class Builder<T, B : BasisHelper> {
         private var context: Context? = null
 
         @LayoutRes
         private var layoutId: Int = 0
-        private var layoutView: WeakReference<View>? = null
+        private var layoutView: View? = null
         private var gravity: FxGravity = FxGravity.DEFAULT
         private var clickTime: Long = 300L
         private var layoutParams: FrameLayout.LayoutParams? = null
@@ -190,7 +196,6 @@ open class BasisHelper {
 
         /** 设置悬浮窗view的layout */
         fun setLayout(@LayoutRes layoutId: Int): T {
-            this.layoutView?.clear()
             this.layoutView = null
             this.layoutId = layoutId
             return this as T
@@ -199,7 +204,7 @@ open class BasisHelper {
         /** 设置悬浮窗View */
         fun setLayoutView(view: View): T {
             layoutId = 0
-            this.layoutView = WeakReference(view)
+            this.layoutView = view
             return this as T
         }
 

floatingx/src/main/java/com/petterp/floatingx/impl/control/FxBasisControlImpl.kt

@@ -73,13 +73,12 @@ open class FxBasisControlImpl(private val helper: BasisHelper) : IFxControl, IFx
 
     override fun updateView(@LayoutRes resource: Int) {
         if (resource == 0) throw IllegalArgumentException("resource cannot be 0!")
-        helper.layoutView?.clear()
         helper.layoutView = null
         updateMangerView(resource)
     }
 
     override fun updateView(view: View) {
-        helper.layoutView = WeakReference(view)
+        helper.layoutView = view
         updateMangerView(0)
     }
 
@@ -261,13 +260,12 @@ open class FxBasisControlImpl(private val helper: BasisHelper) : IFxControl, IFx
     }
 
     protected open fun reset() {
-        helper.enableFx = false
-        helper.fxAnimation?.cancelAnimation()
         managerView?.removeCallbacks(hideAnimationRunnable)
         managerView?.removeCallbacks(cancelAnimationRunnable)
         detach(mContainer?.get())
         managerView = null
         viewHolder = null
+        helper.clear()
         clearContainer()
         helper.fxLog?.d("fxView-lifecycle-> code->cancelFx")
     }

floatingx/src/main/java/com/petterp/floatingx/view/FxManagerView.kt

@@ -70,7 +70,7 @@ class FxManagerView @JvmOverloads constructor(
     }
 
     private fun inflateLayoutView(): View? {
-        val view = helper.layoutView?.get() ?: return null
+        val view = helper.layoutView ?: return null
         helper.fxLog?.d("fxView-->init, way:[layoutView]")
         val lp = layoutParams ?: LayoutParams(
             ViewGroup.LayoutParams.WRAP_CONTENT,