优化触摸移动悬浮窗的代码逻辑

Author: getActivity

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

@@ -11,9 +11,11 @@
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
+import android.view.View.OnTouchListener;
 import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowManager;
+import android.view.WindowManager.LayoutParams;
 import com.hjq.window.EasyWindow;
 
 /**
@@ -22,7 +24,7 @@
  *    time   : 2019/01/04
  *    desc   : 拖拽抽象类
  */
-public abstract class BaseDraggable implements View.OnTouchListener {
+public abstract class BaseDraggable implements OnTouchListener {
 
     private EasyWindow<?> mEasyWindow;
     private View mDecorView;
@@ -43,7 +45,12 @@ public abstract class BaseDraggable implements View.OnTouchListener {
     private int mCurrentWindowInvisibleHeight;
 
     /**
-     * Toast 显示后回调这个类
+     * 判断当前是否处于触摸移动状态
+     */
+    public abstract boolean isTouchMoving();
+
+    /**
+     * 窗口显示后回调这个方法
      */
     @SuppressLint("ClickableViewAccessibility")
     public void start(EasyWindow<?> easyWindow) {
@@ -132,7 +139,21 @@ public int getViewOnScreenY() {
      * 刷新当前 Window 信息
      */
     public void refreshWindowInfo() {
-        View decorView = getDecorView();
+        Context context = mEasyWindow.getContext();
+        if (context == null) {
+            return;
+        }
+
+        View decorView = null;
+
+        if (context instanceof Activity) {
+            decorView = ((Activity) context).getWindow().getDecorView();
+        }
+
+        if (decorView == null) {
+            decorView = getDecorView();
+        }
+
         if (decorView == null) {
             return;
         }
@@ -146,8 +167,8 @@ public void refreshWindowInfo() {
         mCurrentWindowWidth = mTempRect.right - mTempRect.left;
         mCurrentWindowHeight = mTempRect.bottom - mTempRect.top;
 
-        mCurrentWindowInvisibleWidth = mTempRect.left;
-        mCurrentWindowInvisibleHeight = mTempRect.top;
+        mCurrentWindowInvisibleWidth = Math.max(mTempRect.left, 0);
+        mCurrentWindowInvisibleHeight = Math.max(mTempRect.top, 0);
 
         /*
         Log.i(getClass().getSimpleName(),
@@ -422,6 +443,13 @@ protected boolean isFingerMove(float downX, float upX, float downY, float upY) {
         return Math.abs(downX - upX) >= minTouchSlop || Math.abs(downY - upY) >= minTouchSlop;
     }
 
+    /**
+     * 判断当前悬浮窗是否可以移动到屏幕之外的地方
+     */
+    protected boolean isSupportMoveOffScreen() {
+        return mEasyWindow.hasWindowFlags(LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+    }
+
     /**
      * 获取最小触摸距离
      */

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

@@ -34,8 +34,14 @@ public boolean onTouch(View v, MotionEvent event) {
                 float rawMoveX = event.getRawX() - getWindowInvisibleWidth();
                 float rawMoveY = event.getRawY() - getWindowInvisibleHeight();
 
-                float newX = Math.max(rawMoveX - mViewDownX, 0);
-                float newY = Math.max(rawMoveY - mViewDownY, 0);
+                float newX = rawMoveX - mViewDownX;
+                float newY = rawMoveY - mViewDownY;
+
+                // 判断当前是否支持移动到屏幕外
+                if (!isSupportMoveOffScreen()) {
+                    newX = Math.max(newX, 0);
+                    newY = Math.max(newY, 0);
+                }
 
                 // 更新移动的位置
                 updateLocation(newX, newY);
@@ -62,12 +68,13 @@ public boolean onTouch(View v, MotionEvent event) {
             default:
                 break;
         }
-        return false;
+        return mTouchMoving;
     }
 
     /**
      * 当前是否处于触摸移动状态
      */
+    @Override
     public boolean isTouchMoving() {
         return mTouchMoving;
     }

library/src/main/java/com/hjq/window/draggable/SpringBackDraggable.java

@@ -66,8 +66,14 @@ public boolean onTouch(View v, MotionEvent event) {
                 float rawMoveX = event.getRawX() - getWindowInvisibleWidth();
                 float rawMoveY = event.getRawY() - getWindowInvisibleHeight();
 
-                float newX = Math.max(rawMoveX - mViewDownX, 0);
-                float newY = Math.max(rawMoveY - mViewDownY, 0);
+                float newX = rawMoveX - mViewDownX;
+                float newY = rawMoveY - mViewDownY;
+
+                // 判断当前是否支持移动到屏幕外
+                if (!isSupportMoveOffScreen()) {
+                    newX = Math.max(newX, 0);
+                    newY = Math.max(newY, 0);
+                }
 
                 // 更新移动的位置
                 updateLocation(newX, newY);
@@ -95,7 +101,7 @@ public boolean onTouch(View v, MotionEvent event) {
             default:
                 break;
         }
-        return false;
+        return mTouchMoving;
     }
 
     /**
@@ -284,6 +290,7 @@ protected void dispatchSpringBackAnimationEndCallback(Animator animator) {
     /**
      * 当前是否处于触摸移动状态
      */
+    @Override
     public boolean isTouchMoving() {
         return mTouchMoving;
     }
@@ -293,11 +300,11 @@ public interface SpringBackAnimCallback {
         /**
          * 回弹动画开始执行
          */
-        void onSpringBackAnimationStart(EasyWindow<?> easyWindow, Animator animator);
+        default void onSpringBackAnimationStart(EasyWindow<?> easyWindow, Animator animator) {}
 
         /**
          * 回弹动画结束执行
          */
-        void onSpringBackAnimationEnd(EasyWindow<?> easyWindow, Animator animator);
+        default void onSpringBackAnimationEnd(EasyWindow<?> easyWindow, Animator animator) {}
     }
 }