fix:修复吸附时中心点判断异常

Author: Petterpx

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

@@ -28,7 +28,7 @@ class FxAppHelper(
     /** 是否允许插入全部Activity */
     @JvmSynthetic
     internal val isAllInstall: Boolean,
-
+    /** 显示的scope */
     @JvmSynthetic
     internal var scope: FxScopeType,
 
@@ -60,19 +60,19 @@ class FxAppHelper(
     @JvmSynthetic
     internal fun isCanInstall(cls: Class<*>): Boolean {
         return (isAllInstall && !blackFilterList.contains(cls)) ||
-            (!isAllInstall && whiteInsertList.contains(cls))
+                (!isAllInstall && whiteInsertList.contains(cls))
     }
 
     class Builder : FxBasisHelper.Builder<Builder, FxAppHelper>() {
-        private var whiteInsertList: MutableList<Class<*>> = mutableListOf()
-        private var blackFilterList: MutableList<Class<*>> = mutableListOf()
-        private var fxLifecycleExpand: IFxProxyTagActivityLifecycle? = null
-        private var isEnableAllInstall: Boolean = true
-        private var context: Application? = null
-        private var tag = FX_DEFAULT_TAG
         private var enableFx = false
+        private var tag = FX_DEFAULT_TAG
+        private var context: Application? = null
+        private var isEnableAllInstall: Boolean = true
         private var scopeEnum: FxScopeType = FxScopeType.APP
+        private var fxLifecycleExpand: IFxProxyTagActivityLifecycle? = null
         private var askPermissionInterceptor: IFxPermissionInterceptor? = null
+        private var whiteInsertList: MutableList<Class<*>> = mutableListOf()
+        private var blackFilterList: MutableList<Class<*>> = mutableListOf()
 
         /** 用于启用全局浮窗标志，与control.show()同理
          *

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

@@ -97,8 +97,8 @@ class FxSystemContainerView @JvmOverloads constructor(
             height = helper.layoutParams?.height ?: WindowManager.LayoutParams.WRAP_CONTENT
             format = PixelFormat.RGBA_8888
             gravity = Gravity.TOP or Gravity.START
-            flags =
-                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+            flags = (WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                    or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
             type = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
             } else {

floatingx/src/main/java/com/petterp/floatingx/view/helper/FxViewLocationHelper.kt

@@ -8,6 +8,7 @@ import com.petterp.floatingx.assist.FxGravity
 import com.petterp.floatingx.util.coerceInFx
 import com.petterp.floatingx.util.shr
 import com.petterp.floatingx.view.FxBasicContainerView
+import kotlin.math.abs
 
 /**
  * 浮窗坐标的配置助手，用于处理坐标相关的处理
@@ -187,12 +188,14 @@ class FxViewLocationHelper : FxViewBasicHelper(), View.OnLayoutChangeListener {
 
     private fun isNearestLeft(x: Float): Boolean {
         val middle = parentW / 2
-        return x < middle
+        val viewMiddlePoint = x + viewW / 2
+        return viewMiddlePoint < middle
     }
 
     private fun isNearestTop(y: Float): Boolean {
         val middle = parentH / 2
-        return y < middle
+        val viewMiddlePoint = y + viewH / 2
+        return viewMiddlePoint < middle
     }
 
     private fun getHistoryXY(): Pair<Float, Float> {