重构屏幕旋转后悬浮窗重新计算坐标的代码设计

getActivity · getActivity · commit 04ccdff3c386 · 2026-04-27T18:41:35.000+08:00
diff --git a/library/src/main/java/com/hjq/window/EasyWindow.java b/library/src/main/java/com/hjq/window/EasyWindow.java
@@ -291,11 +291,6 @@ public X setWindowLocation(int gravity, @Px int x, @Px int y) {
         mWindowParams.x = x;
         mWindowParams.y = y;
         delayUpdate();
-        sendTask(() -> {
-            if (mWindowDraggableRule != null) {
-                mWindowDraggableRule.refreshLocationCoordinate();
-            }
-        });
         return (X) this;
     }
 
@@ -837,7 +832,7 @@ public void showAsDropDown(@NonNull View anchorView, int showGravity, int xOff,
         Rect windowVisibleRect = new Rect();
         anchorView.getWindowVisibleDisplayFrame(windowVisibleRect);
 
-        mWindowParams.gravity = Gravity.TOP | Gravity.START;
+        mWindowParams.gravity = Gravity.LEFT | Gravity.TOP;
         mWindowParams.x = anchorViewLocation[0] - windowVisibleRect.left + xOff;
         mWindowParams.y = anchorViewLocation[1] - windowVisibleRect.top + yOff;
 
@@ -1172,22 +1167,22 @@ public View getContentView() {
      * 获取当前窗口视图的宽度
      */
     public int getWindowViewWidth() {
-        ViewGroup windowRootLayout = getRootLayout();
-        if (windowRootLayout == null) {
+        ViewGroup rootLayout = getRootLayout();
+        if (rootLayout == null) {
             return 0;
         }
-        return windowRootLayout.getWidth();
+        return rootLayout.getWidth();
     }
 
     /**
      * 获取当前窗口视图的高度
      */
     public int getWindowViewHeight() {
-        ViewGroup windowRootLayout = getRootLayout();
-        if (windowRootLayout == null) {
+        ViewGroup rootLayout = getRootLayout();
+        if (rootLayout == null) {
             return 0;
         }
-        return windowRootLayout.getHeight();
+        return rootLayout.getHeight();
     }
 
     /**
diff --git a/library/src/main/java/com/hjq/window/draggable/AbstractWindowDraggableRule.java b/library/src/main/java/com/hjq/window/draggable/AbstractWindowDraggableRule.java
@@ -9,14 +9,14 @@
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+import android.os.Looper;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Display;
 import android.view.DisplayCutout;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnLayoutChangeListener;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -64,9 +64,6 @@ public abstract class AbstractWindowDraggableRule implements OnTouchListener {
     private int mCurrentScreenInvisibleWidth;
     private int mCurrentScreenInvisibleHeight;
 
-    private int mCurrentViewOnScreenX;
-    private int mCurrentViewOnScreenY;
-
     /** 当前屏幕的物理尺寸 */
     private double mScreenPhysicalSize;
 
@@ -90,11 +87,9 @@ public void start(@NonNull EasyWindow<?> easyWindow) {
             return;
         }
         mRootLayout.setOnTouchListener(this);
-        mRootLayout.post(() -> {
-            refreshWindowInfo();
-            refreshScreenPhysicalSize();
-            refreshLocationCoordinate();
-        });
+
+        refreshWindowInfo();
+        refreshScreenPhysicalSize();
     }
 
     /**
@@ -125,7 +120,6 @@ public final boolean onTouch(@NonNull View view, @NonNull MotionEvent event) {
                 // Github issue 地址：https://github.com/getActivity/EasyWindow/issues/69
                 refreshWindowInfo();
                 refreshScreenPhysicalSize();
-                refreshLocationCoordinate();
 
                 mConsumeTouchView = null;
                 View consumeTouchEventView = findNeedConsumeTouchView(rootLayout, event);
@@ -185,11 +179,11 @@ public void offsetMotionEventLocation(@NonNull View parentView, @NonNull View ch
      * 窗口拖拽回调方法
      *
      * @param easyWindow        当前窗口对象
-     * @param windowRootLayout  当前窗口视图
+     * @param rootLayout        当前窗口视图
      * @param event             当前触摸事件
      * @return                  根据返回值决定是否拦截该事件
      */
-    public abstract boolean onDragWindow(@NonNull EasyWindow<?> easyWindow, @NonNull ViewGroup windowRootLayout, @NonNull MotionEvent event);
+    public abstract boolean onDragWindow(@NonNull EasyWindow<?> easyWindow, @NonNull ViewGroup rootLayout, @NonNull MotionEvent event);
 
     @Nullable
     public EasyWindow<?> getEasyWindow() {
@@ -263,20 +257,6 @@ public int getWindowViewHeight() {
         return mEasyWindow.getWindowViewHeight();
     }
 
-    /**
-     * 获取 View 在当前屏幕的 X 坐标
-     */
-    public int getViewOnScreenX() {
-        return mCurrentViewOnScreenX;
-    }
-
-    /**
-     * 获取 View 在当前屏幕的 Y 坐标
-     */
-    public int getViewOnScreenY() {
-        return mCurrentViewOnScreenY;
-    }
-
     /**
      * 刷新当前 Window 信息
      */
@@ -356,109 +336,134 @@ public void refreshScreenPhysicalSize() {
         mScreenPhysicalSize = Math.sqrt(Math.pow(screenWidthInInches, 2) + Math.pow(screenHeightInInches, 2));
     }
 
-    /**
-     * 刷新当前 View 在屏幕的坐标信息
-     */
-    public void refreshLocationCoordinate() {
-        ViewGroup windowRootLayout = getRootLayout();
-        if (windowRootLayout == null) {
-            return;
-        }
-
-        int[] location = new int[2];
-        windowRootLayout.getLocationOnScreen(location);
-        mCurrentViewOnScreenX = location[0];
-        mCurrentViewOnScreenY = location[1];
-    }
-
     /**
      * 屏幕方向发生了改变
      */
     public void onScreenOrientationChange() {
         // Log.i(getClass().getSimpleName(), "屏幕方向发生了改变");
-        ViewGroup windowRootLayout = getRootLayout();
-        if (windowRootLayout == null) {
+        final ViewGroup rootLayout = getRootLayout();
+        if (rootLayout == null) {
             return;
         }
 
-        long refreshDelayMillis = 100;
-
-        if (!isFollowScreenRotationChanges()) {
-            EasyWindow<?> easyWindow = getEasyWindow();
-            if (easyWindow != null) {
-                easyWindow.sendTask(() -> {
-                    refreshWindowInfo();
-                    refreshScreenPhysicalSize();
-                    refreshLocationCoordinate();
-                }, refreshDelayMillis);
-            }
+        final EasyWindow<?> easyWindow = getEasyWindow();
+        if (easyWindow == null) {
             return;
         }
 
-        // Log.i(getClass().getSimpleName(), "当前 ViewWidth = " + viewWidth + "，ViewHeight = " + viewHeight);
+        final WindowManager.LayoutParams windowParams = easyWindow.getWindowParams();
+
+        final long refreshDelayMillis = 100;
 
-        int startX = mCurrentViewOnScreenX - mCurrentScreenInvisibleWidth;
-        int startY = mCurrentViewOnScreenY - mCurrentScreenInvisibleHeight;
+        if (!isFollowScreenRotationChanges()) {
+            easyWindow.sendTask(() -> {
+                refreshWindowInfo();
+                refreshScreenPhysicalSize();
+            }, refreshDelayMillis);
+            return;
+        }
 
         // 这里为什么用 getMinTouchDistance()，而不是 0？
         // 因为其实用 getLocationOnScreen 测量出来的值不太准，有时候是 0，有时候是 1，有时候 2
         // 但大多数情况是 0 和 1，这里为了兼容这种误差，使用了最小触摸距离来作为基准值
-        float minTouchDistance = getMinTouchDistance();
+        final float minTouchDistance = getMinTouchDistance();
+        // Log.i(getClass().getSimpleName(), "最小触摸距离 minTouchDistance = " + minTouchDistance);
+
+        final int screenWidth = getScreenWidth();
+        final int screenHeight = getScreenHeight();
+        // Log.i(getClass().getSimpleName(), "屏幕旋转前 screenWidth = " + screenWidth + "，screenHeight = " + screenHeight);
+
+        final int screenInvisibleWidth = getScreenInvisibleWidth();
+        final int screenInvisibleHeight = getScreenInvisibleHeight();
+        // Log.i(getClass().getSimpleName(), "屏幕旋转前 screenInvisibleWidth = " + screenInvisibleWidth + "，screenInvisibleHeight = " + screenInvisibleHeight);
+
+        final int windowViewWidth = getWindowViewWidth();
+        final int windowViewHeight = getWindowViewHeight();
+        // Log.i(getClass().getSimpleName(), "屏幕旋转前 windowViewWidth = " + windowViewWidth + "，windowViewHeight = " + windowViewHeight);
+
+        final int windowGravity;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            windowGravity = Gravity.getAbsoluteGravity(windowParams.gravity, rootLayout.getLayoutDirection());
+        } else {
+            windowGravity = windowParams.gravity;
+        }
+        final int windowHorizontalOffset = windowParams.x;
+        final int windowVerticalOffset = windowParams.y;
+
+        int windowHorizontalGravity = windowGravity & Gravity.HORIZONTAL_GRAVITY_MASK;
+        final int currentViewOnScreenX;
+        if (windowHorizontalGravity == Gravity.LEFT) {
+            currentViewOnScreenX = windowHorizontalOffset;
+        } else if (windowHorizontalGravity == Gravity.RIGHT) {
+            currentViewOnScreenX = (screenWidth - screenInvisibleWidth) - windowHorizontalOffset;
+        } else {
+            // Gravity.CENTER_HORIZONTAL
+            currentViewOnScreenX = (screenWidth - screenInvisibleWidth - windowViewWidth) / 2 + windowHorizontalOffset;
+        }
+
+        int windowVerticalGravity = windowGravity & Gravity.VERTICAL_GRAVITY_MASK;
+        final int currentViewOnScreenY;
+        if (windowVerticalGravity == Gravity.TOP) {
+            currentViewOnScreenY = windowVerticalOffset;
+        } else if (windowVerticalGravity == Gravity.BOTTOM) {
+            currentViewOnScreenY = (screenHeight - screenInvisibleHeight) - windowVerticalOffset;
+        } else {
+            // Gravity.CENTER_VERTICAL
+            currentViewOnScreenY = (screenHeight - screenInvisibleHeight - windowViewHeight) / 2 + windowVerticalOffset;
+        }
+        // Log.i(getClass().getSimpleName(), "currentViewOnScreenX = " + currentViewOnScreenX + "，currentViewOnScreenY = " + currentViewOnScreenY);
 
         // 计算水平坐标中心点百分比
-        double horizontalCoordinatePercent;
-        if (startX <= minTouchDistance) {
+        final double horizontalCoordinatePercent;
+        if (currentViewOnScreenX <= minTouchDistance) {
             horizontalCoordinatePercent = 0;
-        } else if (Math.abs(getScreenWidth() - (startX + getWindowViewWidth())) < minTouchDistance) {
+        } else if (Math.abs(screenWidth - (currentViewOnScreenX + windowViewWidth)) <= minTouchDistance) {
             horizontalCoordinatePercent = 1;
         } else {
             // 这里因为要计算中心点位置，所以要加上 View 宽度的二分之一，因为坐标是左上开始计算的
-            double centerX = startX + getWindowViewWidth() / 2f;
-            horizontalCoordinatePercent = centerX / getScreenWidth();
+            horizontalCoordinatePercent = (currentViewOnScreenX + windowViewWidth / 2f) / screenWidth;
         }
-
         // 计算垂直坐标中心点百分比
-        double verticalCoordinatePercent;
-        if (startY <= minTouchDistance) {
+        final double verticalCoordinatePercent;
+        if (currentViewOnScreenY <= minTouchDistance) {
             verticalCoordinatePercent = 0;
-        } else if (Math.abs(getScreenHeight() - (startY + getWindowViewHeight())) < minTouchDistance) {
+        } else if (Math.abs(screenHeight - (currentViewOnScreenY + windowViewHeight)) <= minTouchDistance) {
             verticalCoordinatePercent = 1;
         } else {
             // 这里因为要计算中心点位置，所以要加上 View 高度的二分之一，因为坐标是左上开始计算的
-            double centerY = startY + getWindowViewHeight() / 2d;
-            verticalCoordinatePercent = centerY / getScreenHeight();
+            verticalCoordinatePercent = (currentViewOnScreenY + windowViewHeight / 2d) / screenHeight;
         }
+        // Log.i(getClass().getSimpleName(), "horizontalCoordinatePercent = " + horizontalCoordinatePercent + "，verticalCoordinatePercent = " + verticalCoordinatePercent);
 
         // Github issue 地址：https://github.com/getActivity/EasyWindow/issues/49
         // 修复在竖屏状态下，先锁屏，再旋转到横屏，后进行解锁，出现的 View.getWindowVisibleDisplayFrame 计算有问题的 Bug
         // 这是因为屏幕在旋转的时候，视图正处于改变状态，此时通过 View 获取窗口可视区域是有问题，会获取到旧的可视区域
         // 解决方案是监听一下 View 布局变化监听，在收到回调的时候再去获取 View 获取窗口可视区域
-        windowRootLayout.addOnLayoutChangeListener(new OnLayoutChangeListener() {
-            @Override
-            public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                view.removeOnLayoutChangeListener(this);
-                view.postDelayed(() -> {
-                    // 先刷新当前窗口信息
-                    refreshWindowInfo();
-                    // 刷新屏幕的物理尺寸
-                    refreshScreenPhysicalSize();
-                    int x = Math.max((int) (getScreenWidth() * horizontalCoordinatePercent - getWindowViewWidth() / 2d), 0);
-                    int y = Math.max((int) (getScreenHeight() * verticalCoordinatePercent - getWindowViewHeight() / 2d), 0);
-                    updateLocation(x, y);
-                    // 需要注意，这里需要延迟执行，否则会有问题
-                    view.post(() -> onScreenRotateInfluenceCoordinateChangeFinish());
-                }, refreshDelayMillis);
-            }
+        Looper.myQueue().addIdleHandler(() -> {
+            easyWindow.sendTask(() -> {
+                // 先刷新当前窗口信息
+                refreshWindowInfo();
+                // 刷新屏幕的物理尺寸
+                refreshScreenPhysicalSize();
+                int newScreenWidth = getScreenWidth();
+                int newScreenHeight = getScreenHeight();
+                // Log.i(getClass().getSimpleName(), "屏幕旋转后 screenWidth = " + newScreenWidth + "，screenHeight = " + newScreenHeight);
+                int newViewOnScreenX = Math.max((int) (newScreenWidth * horizontalCoordinatePercent - windowViewWidth / 2d), 0);
+                int newViewOnScreenY = Math.max((int) (newScreenHeight * verticalCoordinatePercent - windowViewHeight / 2d), 0);
+                // Log.i(getClass().getSimpleName(), "屏幕旋转后 newViewOnScreenX = " + newViewOnScreenX + "，newViewOnScreenY = " + newViewOnScreenY);
+                updateLocation(newViewOnScreenX, newViewOnScreenY);
+                // 需要注意，这里需要延迟执行，否则会有问题
+                easyWindow.sendTask(this::onScreenRotateInfluenceCoordinateChangeFinish);
+            }, refreshDelayMillis);
+            return false;
         });
     }
 
     /**
      * 屏幕旋转导致悬浮窗坐标发生变化完成方法
      */
     protected void onScreenRotateInfluenceCoordinateChangeFinish() {
-        refreshWindowInfo();
-        refreshScreenPhysicalSize();
-        refreshLocationCoordinate();
+        // default implementation ignored
     }
 
     /**
@@ -548,7 +553,6 @@ public void updateWindowCoordinate(int x, int y) {
         params.gravity = screenGravity;
 
         mEasyWindow.update();
-        refreshLocationCoordinate();
     }
 
     /**
diff --git a/library/src/main/java/com/hjq/window/draggable/MovingWindowDraggableRule.java b/library/src/main/java/com/hjq/window/draggable/MovingWindowDraggableRule.java
@@ -23,7 +23,7 @@ public class MovingWindowDraggableRule extends AbstractWindowDraggableRule {
 
     @SuppressLint("ClickableViewAccessibility")
     @Override
-    public boolean onDragWindow(@NonNull EasyWindow<?> easyWindow, @NonNull ViewGroup windowRootLayout, @NonNull MotionEvent event) {
+    public boolean onDragWindow(@NonNull EasyWindow<?> easyWindow, @NonNull ViewGroup rootLayout, @NonNull MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
                 // 记录按下的位置（相对 View 的坐标）
diff --git a/library/src/main/java/com/hjq/window/draggable/SpringBackWindowDraggableRule.java b/library/src/main/java/com/hjq/window/draggable/SpringBackWindowDraggableRule.java
@@ -56,7 +56,7 @@ public SpringBackWindowDraggableRule(int springBackOrientation) {
 
     @SuppressLint("ClickableViewAccessibility")
     @Override
-    public boolean onDragWindow(@NonNull EasyWindow<?> easyWindow, @NonNull ViewGroup windowRootLayout, @NonNull MotionEvent event) {
+    public boolean onDragWindow(@NonNull EasyWindow<?> easyWindow, @NonNull ViewGroup rootLayout, @NonNull MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
                 // 记录按下的位置（相对 View 的坐标）
@@ -111,7 +111,14 @@ public boolean onDragWindow(@NonNull EasyWindow<?> easyWindow, @NonNull ViewGrou
      * 触发回弹 View 到屏幕边缘
      */
     public void dispatchSpringBackViewToScreenEdge() {
-        dispatchSpringBackViewToScreenEdge(getViewOnScreenX(), getViewOnScreenY());
+        ViewGroup rootLayout = getRootLayout();
+        if (rootLayout == null) {
+            return;
+        }
+
+        int[] location = new int[2];
+        rootLayout.getLocationOnScreen(location);
+        dispatchSpringBackViewToScreenEdge(location[0], location[1]);
     }
 
     /**
