优化屏幕旋转后悬浮窗显示的位置

Author: getActivity

.github/ISSUE_TEMPLATE/issue_template_bug.md

@@ -22,6 +22,8 @@ assignees: getActivity
 
 * 出现问题的安卓版本【必填】：请填写出现问题的 Android 版本
 
+* 问题信息的来源渠道【必填】：请填写问题的来源（例如：自己遇到的/Bugly 看到的/用户反馈等等）
+
 #### 请回答
 
 * 是部分机型还是所有机型都会出现【必答】：部分/全部（例如：某为，某 Android 版本会出现）

README.md

@@ -1,10 +1,10 @@
 # 悬浮窗框架
 
-* 项目地址：[Github](https://github.com/getActivity/XToast)、[码云](https://gitee.com/getActivity/XToast)
+* 项目地址：[Github](https://github.com/getActivity/XToast)
 
 * 博客地址：[悬浮窗需求终结者](https://www.jianshu.com/p/247d705b87b6)
 
-* 可以扫码下载 Demo 进行演示或者测试，如果扫码下载不了的，[点击此处可直接下载](https://github.com/getActivity/XToast/releases/download/8.5/XToast.apk)
+* 可以扫码下载 Demo 进行演示或者测试，如果扫码下载不了的，[点击此处可直接下载](https://github.com/getActivity/XToast/releases/download/8.6/XToast.apk)
 
 ![](picture/demo_code.png)
 
@@ -49,7 +49,7 @@ android {
 
 dependencies {
     // 悬浮窗框架：https://github.com/getActivity/XToast
-    implementation 'com.github.getActivity:XToast:8.5'
+    implementation 'com.github.getActivity:XToast:8.6'
 }
 ```
 
@@ -218,6 +218,10 @@ public final class FloatingLifecycle implements Application.ActivityLifecycleCal
 * Android 版本适配：[AndroidVersionAdapter](https://github.com/getActivity/AndroidVersionAdapter) ![](https://img.shields.io/github/stars/getActivity/AndroidVersionAdapter.svg) ![](https://img.shields.io/github/forks/getActivity/AndroidVersionAdapter.svg)
 
 * Android 代码规范：[AndroidCodeStandard](https://github.com/getActivity/AndroidCodeStandard) ![](https://img.shields.io/github/stars/getActivity/AndroidCodeStandard.svg) ![](https://img.shields.io/github/forks/getActivity/AndroidCodeStandard.svg)
+
+* Android 资源大汇总：[AndroidIndex](https://github.com/getActivity/AndroidIndex) ![](https://img.shields.io/github/stars/getActivity/AndroidIndex.svg) ![](https://img.shields.io/github/forks/getActivity/AndroidIndex.svg)
+
+* Android 开源排行榜：[AndroidGithubBoss](https://github.com/getActivity/AndroidGithubBoss) ![](https://img.shields.io/github/stars/getActivity/AndroidGithubBoss.svg) ![](https://img.shields.io/github/forks/getActivity/AndroidGithubBoss.svg)
 
 * Studio 精品插件：[StudioPlugins](https://github.com/getActivity/StudioPlugins) ![](https://img.shields.io/github/stars/getActivity/StudioPlugins.svg) ![](https://img.shields.io/github/forks/getActivity/StudioPlugins.svg)
 
@@ -229,7 +233,7 @@ public final class FloatingLifecycle implements Application.ActivityLifecycleCal
 
 ![](https://raw.githubusercontent.com/getActivity/Donate/master/picture/official_ccount.png)
 
-#### Android 技术分享 QQ 群：78797078
+#### Android 技术 Q 群：10047167
 
 #### 如果您觉得我的开源库帮你节省了大量的开发时间，请扫描下方的二维码随意打赏，要是能打赏个 10.24 :monkey_face:就太:thumbsup:了。您的支持将鼓励我继续创作:octocat:
 

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.xtoast.demo"
         minSdkVersion 16
         targetSdkVersion 31
-        versionCode 85
-        versionName "8.5"
+        versionCode 86
+        versionName "8.6"
     }
 
     // 支持 Java JDK 8
@@ -52,22 +52,23 @@ android {
 dependencies {
     // 依赖 libs 目录下所有的 jar 和 aar 包
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+
     implementation project(':library')
 
     // AndroidX 库：https://github.com/androidx/androidx
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     // Material 库：https://github.com/material-components/material-components-android
     implementation 'com.google.android.material:material:1.4.0'
 
     // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.github.getActivity:XXPermissions:13.2'
+    implementation 'com.github.getActivity:XXPermissions:16.2'
 
     // 标题栏框架：https://github.com/getActivity/TitleBar
-    implementation 'com.github.getActivity:TitleBar:9.3'
+    implementation 'com.github.getActivity:TitleBar:9.6'
 
     // 吐司框架：https://github.com/getActivity/ToastUtils
-    implementation 'com.github.getActivity:ToastUtils:10.0'
+    implementation 'com.github.getActivity:ToastUtils:10.5'
 
     // 内存泄漏捕捉：https://github.com/square/leakcanary
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
 
         <activity
             android:name=".MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true">
 
             <intent-filter>

app/src/main/res/values-v23/styles.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <!-- 解决 Android 5.1 及以上版本 Button 英文字符串自动变大写的问题 -->
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+</resources>

app/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">XToast</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <!-- Base application theme. -->
@@ -8,8 +9,6 @@
         <item name="colorAccent">@color/colorAccent</item>
         <!-- 解决 Android 5.1 及以上版本 Button 英文字符串自动变大写的问题 -->
         <item name="android:textAllCaps">false</item>
-        <!-- 设置窗口全屏 -->
-<!--        <item name="android:windowFullscreen">true</item>-->
     </style>
 
     <!-- 缩放动画 -->

library/build.gradle

@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 85
-        versionName "8.5"
+        versionCode 86
+        versionName "8.6"
     }
 
     // 支持 JDK 1.8

library/src/main/java/com/hjq/xtoast/ScreenOrientationMonitor.java

@@ -0,0 +1,65 @@
+package com.hjq.xtoast;
+
+import android.content.ComponentCallbacks;
+import android.content.Context;
+import android.content.res.Configuration;
+
+/**
+ *    author : Android 轮子哥
+ *    github : https://github.com/getActivity/XToast
+ *    time   : 2022/10/03
+ *    desc   : 屏幕方向旋转监听
+ */
+final class ScreenOrientationMonitor implements ComponentCallbacks {
+
+   private int mScreenOrientation;
+
+   private OnScreenOrientationCallback mCallback;
+
+   public ScreenOrientationMonitor(Context context) {
+      mScreenOrientation = context.getResources().getConfiguration().orientation;
+      context.registerComponentCallbacks(this);
+   }
+
+   /**
+    * 注册监听
+    */
+   void register(Context context) {
+      context.registerComponentCallbacks(this);
+   }
+
+   /**
+    * 取消监听
+    */
+   void unregister(Context context) {
+      context.unregisterComponentCallbacks(this);
+   }
+
+   @Override
+   public void onConfigurationChanged(Configuration newConfig) {
+      if (mScreenOrientation == newConfig.orientation) {
+         return;
+      }
+      mScreenOrientation = newConfig.orientation;
+
+      if (mCallback == null) {
+         return;
+      }
+      mCallback.onScreenOrientationChange(mScreenOrientation);
+   }
+
+   @Override
+   public void onLowMemory() {}
+
+   public void setOnScreenOrientationCallback(OnScreenOrientationCallback callback) {
+      mCallback = callback;
+   }
+
+   public interface OnScreenOrientationCallback {
+
+      /**
+       * 显示回调
+       */
+      default void onScreenOrientationChange(int orientation) {}
+   }
+}

library/src/main/java/com/hjq/xtoast/XToast.java

@@ -35,8 +35,8 @@
  *    doc    : https://developer.android.google.cn/reference/android/view/WindowManager.html
  *             https://developer.android.google.cn/reference/kotlin/android/view/WindowManager.LayoutParams?hl=en
  */
-@SuppressWarnings({"unchecked", "unused", "deprecation", "UnusedReturnValue"})
-public class XToast<X extends XToast<?>> implements Runnable {
+@SuppressWarnings({"unchecked", "unused", "UnusedReturnValue"})
+public class XToast<X extends XToast<?>> implements Runnable, ScreenOrientationMonitor.OnScreenOrientationCallback {
 
     private static final Handler HANDLER = new Handler(Looper.getMainLooper());
 
@@ -60,6 +60,9 @@ public class XToast<X extends XToast<?>> implements Runnable {
     /** 吐司显示和取消监听 */
     private OnLifecycle mListener;
 
+    /** 屏幕旋转监听 */
+    private ScreenOrientationMonitor mScreenOrientationMonitor;
+
     /**
      * 创建一个局部悬浮窗
      */
@@ -451,16 +454,25 @@ public X setDraggable() {
      * 设置拖动规则
      */
     public X setDraggable(BaseDraggable draggable) {
-        // 如果当前是否设置了不可触摸，如果是就擦除掉这个标记
-        clearWindowFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
-        // 如果当前是否设置了可移动窗口到屏幕之外，如果是就擦除这个标记
-        clearWindowFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
-
         mDraggable = draggable;
-        if (isShowing()) {
-            update();
-            mDraggable.start(this);
+        if (draggable != null) {
+            // 如果当前是否设置了不可触摸，如果是就擦除掉这个标记
+            clearWindowFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
+            // 如果当前是否设置了可移动窗口到屏幕之外，如果是就擦除这个标记
+            clearWindowFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+
+            if (isShowing()) {
+                update();
+                draggable.start(this);
+            }
+        }
+
+        if (mScreenOrientationMonitor == null) {
+            mScreenOrientationMonitor = new ScreenOrientationMonitor(mContext);
+            mScreenOrientationMonitor.setOnScreenOrientationCallback(this);
         }
+        mScreenOrientationMonitor.register(mContext);
+
         return (X) this;
     }
 
@@ -733,6 +745,9 @@ public void recycle() {
         if (isShowing()) {
             cancel();
         }
+        if (mScreenOrientationMonitor != null) {
+            mScreenOrientationMonitor.unregister(mContext);
+        }
         if (mListener != null) {
             mListener.onRecycler(this);
         }
@@ -841,19 +856,33 @@ public X setText(int id, CharSequence text) {
     }
 
     /**
-     * 设置文本颜色
+     * 设置字体颜色
      */
     public X setTextColor(int id, int color) {
         ((TextView) findViewById(id)).setTextColor(color);
         return (X) this;
     }
 
+    /**
+     * 设置字体大小
+     */
+    public X setTextSize(int id, float size) {
+        ((TextView) findViewById(id)).setTextSize(size);
+        return (X) this;
+    }
+
+    public X setTextSize(int id, int unit, float size) {
+        ((TextView) findViewById(id)).setTextSize(unit, size);
+        return (X) this;
+    }
+
     /**
      * 设置提示
      */
     public X setHint(int viewId, int stringId) {
         return setHint(viewId, mContext.getResources().getString(stringId));
     }
+
     public X setHint(int id, CharSequence text) {
         ((TextView) findViewById(id)).setHint(text);
         return (X) this;
@@ -1018,6 +1047,20 @@ public void run() {
         cancel();
     }
 
+    /**
+     * {@link ScreenOrientationMonitor.OnScreenOrientationCallback}
+     */
+    @Override
+    public void onScreenOrientationChange(int orientation) {
+        if (!isShowing()) {
+            return;
+        }
+        if (mDraggable == null) {
+            return;
+        }
+        mDraggable.onScreenOrientationChange(orientation);
+    }
+
     /**
      * View 的点击事件监听
      */