新增 getWindowViewWidth 方法来代替 getWindowContentWidth 方法

新增 getWindowViewHeight 方法来代替 getWindowContentHeight 方法

Author: getActivity

README.md

@@ -325,10 +325,10 @@ easyWindow.setWindowParams(@NonNull WindowManager.LayoutParams params);
 // 重新设置 WindowManager 对象
 easyWindow.setWindowManager(@NonNull WindowManager windowManager);
 
-// 获取当前窗口内容宽度
-easyWindow.getWindowContentWidth();
-// 获取当前窗口内容高度
-easyWindow.getWindowContentHeight();
+// 获取当前窗口视图宽度
+easyWindow.getWindowViewWidth();
+// 获取当前窗口视图高度
+easyWindow.getWindowViewHeight();
 
 // 设置可见性状态给 View
 easyWindow.setVisibilityByView(@IdRes int viewId, int visibility);

app/src/main/java/com/hjq/window/demo/SemiStealthWindow.java

@@ -98,8 +98,8 @@ private void hideHalfView(int gravity) {
             return;
         }
 
-        int viewWidth = getWindowContentWidth();
-        int viewHeight = getWindowContentHeight();
+        int viewWidth = getWindowViewWidth();
+        int viewHeight = getWindowViewHeight();
 
         // 创建一个矩形来定义裁剪区域
         Rect clipBounds = new Rect();
@@ -110,7 +110,7 @@ private void hideHalfView(int gravity) {
                     WindowManager.LayoutParams windowParams = getWindowParams();
                     windowDraggableRule.updateLocation(windowParams.x - viewWidth / 2f, windowParams.y, true);
                 } else {
-                    int offSet = getWindowContentWidth() / 2; //用小球来做偏移
+                    int offSet = getWindowViewWidth() / 2; //用小球来做偏移
                     clipBounds.set(offSet, 0, viewWidth, viewHeight);
                     // 设置画板偏移
                     windowRootLayout.setTranslationX(-offSet);
@@ -204,7 +204,7 @@ private boolean isTopShow() {
         if (isLeftShow()) {
             return windowParams.x > windowParams.y;
         } else {
-            return getScreenWidth() - windowParams.x - getWindowContentWidth() > windowParams.y;
+            return getScreenWidth() - windowParams.x - getWindowViewWidth() > windowParams.y;
         }
     }
 
@@ -222,7 +222,7 @@ private int getScreenWidth() {
      * 悬浮球是否靠左显示
      */
     private boolean isLeftShow(){
-        return (getWindowParams().x + getWindowContentWidth() / 2f)  < getScreenWidth() / 2f;
+        return (getWindowParams().x + getWindowViewWidth() / 2f)  < getScreenWidth() / 2f;
     }
 
     /** {@link OnWindowDraggingListener} */

library/src/main/java/com/hjq/window/EasyWindow.java

@@ -1258,9 +1258,16 @@ public View getContentView() {
     }
 
     /**
-     * 获取当前窗口内容宽度
+     * @deprecated           该 API 已经过时，随时会被删除，请尽早迁移到 {@link #getWindowTag()}
      */
     public int getWindowContentWidth() {
+        return getWindowViewWidth();
+    }
+
+    /**
+     * 获取当前窗口视图的宽度
+     */
+    public int getWindowViewWidth() {
         ViewGroup windowRootLayout = getRootLayout();
         if (windowRootLayout == null) {
             return 0;
@@ -1269,9 +1276,16 @@ public int getWindowContentWidth() {
     }
 
     /**
-     * 获取当前窗口内容高度
+     * @deprecated           该 API 已经过时，随时会被删除，请尽早迁移到 {@link #getWindowTag()}
      */
     public int getWindowContentHeight() {
+        return getWindowViewHeight();
+    }
+
+    /**
+     * 获取当前窗口视图的高度
+     */
+    public int getWindowViewHeight() {
         ViewGroup windowRootLayout = getRootLayout();
         if (windowRootLayout == null) {
             return 0;

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

@@ -229,23 +229,23 @@ public int getWindowHeight() {
     }
 
     /**
-     * 获取当前窗口内容宽度
+     * 获取当前窗口视图的宽度
      */
-    public int getWindowContentWidth() {
+    public int getWindowViewWidth() {
         if (mEasyWindow == null) {
             return 0;
         }
-        return mEasyWindow.getWindowContentWidth();
+        return mEasyWindow.getWindowViewWidth();
     }
 
     /**
-     * 获取当前窗口内容高度
+     * 获取当前窗口视图的高度
      */
-    public int getWindowContentHeight() {
+    public int getWindowViewHeight() {
         if (mEasyWindow == null) {
             return 0;
         }
-        return mEasyWindow.getWindowContentHeight();
+        return mEasyWindow.getWindowViewHeight();
     }
 
     /**
@@ -499,8 +499,8 @@ public void updateLocation(int x, int y, boolean allowMoveToScreenNotch) {
             return;
         }
 
-        int viewWidth = getWindowContentWidth();
-        int viewHeight = getWindowContentHeight();
+        int viewWidth = getWindowViewWidth();
+        int viewHeight = getWindowViewHeight();
 
         int windowWidth = getWindowWidth();
         int windowHeight = getWindowHeight();

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

@@ -139,7 +139,7 @@ public void dispatchSpringBackViewToScreenEdge(float rawX, float rawY) {
                 } else {
                     // 回弹到屏幕右边（注意减去 View 宽度，因为 View 坐标系是从屏幕左上角开始算的）
                     // 如果在最右边向右移动就会产生负数，这里需要处理掉，因为坐标没有负数这一说
-                    endX = Math.max((float) screenWidth - getWindowContentWidth(), 0);
+                    endX = Math.max((float) screenWidth - getWindowViewWidth(), 0);
                 }
                 float y = rawMoveY - mViewDownY;
                 if (!equalsWithRelativeTolerance(startX, endX)) {
@@ -160,7 +160,7 @@ public void dispatchSpringBackViewToScreenEdge(float rawX, float rawY) {
                 } else {
                     // 回弹到屏幕底部（注意减去 View 高度，因为 View 坐标系是从屏幕左上角开始算的）
                     // 如果在最底部向下移动就会产生负数，这里需要处理掉，因为坐标没有负数这一说
-                    endY = Math.max((float) screenHeight - getWindowContentHeight(), 0);
+                    endY = Math.max((float) screenHeight - getWindowViewHeight(), 0);
                 }
                 if (!equalsWithRelativeTolerance(startY, endY)) {
                     // 从移动的点回弹到边界上