优化判断 View 是否移动代码的逻辑

Author: getActivity

README.md

@@ -32,7 +32,7 @@ allprojects {
 ```groovy
 dependencies {
     // 悬浮窗框架：https://github.com/getActivity/XToast
-    implementation 'com.github.getActivity:XToast:8.0'
+    implementation 'com.github.getActivity:XToast:8.1'
 }
 ```
 

XToast.apk

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.xtoast.demo"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 80
-        versionName "8.0"
+        versionCode 81
+        versionName "8.1"
     }
     buildTypes {
         release {

app/build.gradle

@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 80
-        versionName "8.0"
+        versionCode 81
+        versionName "8.1"
     }
 
     android.libraryVariants.all { variant ->

library/build.gradle

@@ -1,10 +1,8 @@
 package com.hjq.xtoast.draggable;
 
-import android.content.Context;
 import android.graphics.Rect;
 import android.view.Gravity;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.view.WindowManager;
 
 import com.hjq.xtoast.XToast;
@@ -50,6 +48,24 @@ protected View getRootView() {
         return mRootView;
     }
 
+    /**
+     * 获取当前 Window 的宽度
+     */
+    protected int getWindowWidth() {
+        Rect rect = new Rect();
+        getRootView().getWindowVisibleDisplayFrame(rect);
+        return rect.right - rect.left;
+    }
+
+    /**
+     * 获取当前 Window 的高度
+     */
+    protected int getWindowHeight() {
+        Rect rect = new Rect();
+        getRootView().getWindowVisibleDisplayFrame(rect);
+        return rect.bottom - rect.top;
+    }
+
     /**
      * 获取窗口不可见的宽度，一般情况下为横屏状态下刘海的高度
      */
@@ -111,8 +127,7 @@ protected void updateLocation(int x, int y) {
      * @param downY         手指按下时的 y 坐标
      * @param upY           手指抬起时的 y 坐标
      */
-    protected boolean isTouchMove(Context context, float downX, float upX, float downY, float upY) {
-        return Math.abs(downX - upX) > ViewConfiguration.get(context).getScaledTouchSlop() ||
-                Math.abs(downY - upY) > ViewConfiguration.get(context).getScaledTouchSlop();
+    protected boolean isTouchMove(float downX, float upX, float downY, float upY) {
+        return Math.abs(downX - upX) >= 1f || Math.abs(downY - upY) >= 1f;
     }
 }

library/src/main/java/com/hjq/xtoast/draggable/BaseDraggable.java

@@ -16,6 +16,9 @@ public class MovingDraggable extends BaseDraggable {
     private float mViewDownX;
     private float mViewDownY;
 
+    /** 触摸移动标记 */
+    private boolean mMoveTouch;
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public boolean onTouch(View v, MotionEvent event) {
@@ -24,6 +27,7 @@ public boolean onTouch(View v, MotionEvent event) {
                 // 记录按下的位置（相对 View 的坐标）
                 mViewDownX = event.getX();
                 mViewDownY = event.getY();
+                mMoveTouch = false;
                 break;
             case MotionEvent.ACTION_MOVE:
                 // 记录移动的位置（相对屏幕的坐标）
@@ -32,10 +36,15 @@ public boolean onTouch(View v, MotionEvent event) {
 
                 // 更新移动的位置
                 updateLocation(rawMoveX - mViewDownX, rawMoveY - mViewDownY);
+
+                if (!mMoveTouch && isTouchMove(mViewDownX, event.getX(), mViewDownY, event.getY())) {
+                    // 如果用户移动了手指，那么就拦截本次触摸事件，从而不让点击事件生效
+                    mMoveTouch = true;
+                }
                 break;
             case MotionEvent.ACTION_UP:
-                // 如果用户移动了手指，那么就拦截本次触摸事件，从而不让点击事件生效
-                return isTouchMove(v.getContext(), mViewDownX, event.getX(), mViewDownY, event.getY());
+            case MotionEvent.ACTION_CANCEL:
+                return mMoveTouch;
             default:
                 break;
         }

library/src/main/java/com/hjq/xtoast/draggable/MovingDraggable.java

@@ -2,10 +2,8 @@
 
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
-import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.LinearLayout;
 
 /**
@@ -23,6 +21,9 @@ public class SpringDraggable extends BaseDraggable {
     /** 回弹的方向 */
     private final int mOrientation;
 
+    /** 触摸移动标记 */
+    private boolean mMoveTouch;
+
     public SpringDraggable() {
         this(LinearLayout.HORIZONTAL);
     }
@@ -49,6 +50,7 @@ public boolean onTouch(View v, MotionEvent event) {
                 // 记录按下的位置（相对 View 的坐标）
                 mViewDownX = event.getX();
                 mViewDownY = event.getY();
+                mMoveTouch = false;
                 break;
             case MotionEvent.ACTION_MOVE:
                 // 记录移动的位置（相对屏幕的坐标）
@@ -57,8 +59,14 @@ public boolean onTouch(View v, MotionEvent event) {
 
                 // 更新移动的位置
                 updateLocation(rawMoveX - mViewDownX, rawMoveY - mViewDownY);
+
+                if (!mMoveTouch && isTouchMove(mViewDownX, event.getX(), mViewDownY, event.getY())) {
+                    // 如果用户移动了手指，那么就拦截本次触摸事件，从而不让点击事件生效
+                    mMoveTouch = true;
+                }
                 break;
             case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
                 // 记录移动的位置（相对屏幕的坐标）
                 rawMoveX = event.getRawX() - getWindowInvisibleWidth();
                 rawMoveY = event.getRawY() - getWindowInvisibleHeight();
@@ -68,7 +76,7 @@ public boolean onTouch(View v, MotionEvent event) {
                     case LinearLayout.HORIZONTAL:
                         final float rawFinalX;
                         // 获取当前屏幕的宽度
-                        int screenWidth = getScreenWidth();
+                        int screenWidth = getWindowWidth();
                         if (rawMoveX < screenWidth / 2f) {
                             // 回弹到屏幕左边
                             rawFinalX = 0f;
@@ -82,7 +90,7 @@ public boolean onTouch(View v, MotionEvent event) {
                     case LinearLayout.VERTICAL:
                         final float rawFinalY;
                         // 获取当前屏幕的高度
-                        int screenHeight = getScreenHeight();
+                        int screenHeight = getWindowHeight();
                         if (rawMoveY < screenHeight / 2f) {
                             // 回弹到屏幕顶部
                             rawFinalY = 0f;
@@ -96,34 +104,13 @@ public boolean onTouch(View v, MotionEvent event) {
                     default:
                         break;
                 }
-                // 如果用户移动了手指，那么就拦截本次触摸事件，从而不让点击事件生效
-                return isTouchMove(v.getContext(), mViewDownX, event.getX(), mViewDownY, event.getY());
+                return mMoveTouch;
             default:
                 break;
         }
         return false;
     }
 
-    /**
-     *  获取屏幕的宽度
-     */
-    private int getScreenWidth() {
-        WindowManager manager = getWindowManager();
-        DisplayMetrics outMetrics = new DisplayMetrics();
-        manager.getDefaultDisplay().getMetrics(outMetrics);
-        return outMetrics.widthPixels;
-    }
-
-    /**
-     *  获取屏幕的高度
-     */
-    private int getScreenHeight() {
-        WindowManager manager = getWindowManager();
-        DisplayMetrics outMetrics = new DisplayMetrics();
-        manager.getDefaultDisplay().getMetrics(outMetrics);
-        return outMetrics.heightPixels;
-    }
-
     /**
      * 执行水平回弹动画
      *