优化内存回收机制

Author: getActivity

README.md

@@ -4,9 +4,7 @@
 
 > 博客地址：[悬浮窗需求终结者](https://www.jianshu.com/p/247d705b87b6)
 
-> 已投入公司项目多时，没有任何毛病，可胜任任何需求，[点击此处下载Demo](https://raw.githubusercontent.com/getActivity/XToast/master/XToast.apk)
-
-> 想了解实现原理的可以点击此链接查看：[XToast](https://github.com/getActivity/XToast/blob/master/library/src/main/java/com/hjq/xtoast/XToast.java) 源码
+> 已投入公司项目多时，没有任何毛病，可胜任任何需求，[点击此处下载Demo](XToast.apk)
 
 ![](XToast.gif)
 

XToast.apk

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.xtoast.demo"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 53
-        versionName "5.3"
+        versionCode 55
+        versionName "5.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -33,5 +33,5 @@ dependencies {
     // 吐司工具类：https://github.com/getActivity/ToastUtils
     implementation 'com.hjq:toast:8.2'
     // 内存泄漏捕捉：https://github.com/square/leakcanary
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
 }

app/build.gradle

@@ -7,16 +7,16 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 53
-        versionName "5.3"
+        versionCode 55
+        versionName "5.5"
     }
 }
 
 publish {
     userOrg = 'getactivity'
     groupId = 'com.hjq'
     artifactId = 'xtoast'
-    version = '5.3'
+    version = '5.5'
     description = 'This is a simple and easy to use suspension window frame'
     website = "https://github.com/getActivity/XToast"
 }

library/build.gradle

@@ -60,8 +60,11 @@ public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
     @Override
     public void onActivityDestroyed(Activity activity) {
         if (mActivity == activity) {
-            mToast = null;
             mActivity = null;
+            if (mToast != null) {
+                mToast.recycle();
+                mToast = null;
+            }
         }
     }
 }

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

@@ -54,23 +54,6 @@ public class XToast<X extends XToast> {
     /** 吐司显示和取消监听 */
     private OnToastListener mListener;
 
-    private XToast(Context context) {
-        mContext = context;
-        mWindowManager = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE));
-        // 配置一些默认的参数
-        mWindowParams = new WindowManager.LayoutParams();
-        mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        mWindowParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        mWindowParams.format = PixelFormat.TRANSLUCENT;
-        mWindowParams.windowAnimations = android.R.style.Animation_Toast;
-        mWindowParams.packageName = context.getPackageName();
-        // 开启窗口常亮和设置可以触摸外层布局（除 WindowManager 外的布局，默认是 WindowManager 显示的时候外层不可触摸）
-        // 需要注意的是设置了 FLAG_NOT_TOUCH_MODAL 必须要设置 FLAG_NOT_FOCUSABLE，否则就会导致用户按返回键无效
-        mWindowParams.flags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
-                | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
-    }
-
     /**
      * 创建一个局部悬浮窗
      */
@@ -101,6 +84,23 @@ public XToast(Application application) {
         }
     }
 
+    private XToast(Context context) {
+        mContext = context;
+        mWindowManager = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE));
+        // 配置一些默认的参数
+        mWindowParams = new WindowManager.LayoutParams();
+        mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowParams.format = PixelFormat.TRANSLUCENT;
+        mWindowParams.windowAnimations = android.R.style.Animation_Toast;
+        mWindowParams.packageName = context.getPackageName();
+        // 开启窗口常亮和设置可以触摸外层布局（除 WindowManager 外的布局，默认是 WindowManager 显示的时候外层不可触摸）
+        // 需要注意的是设置了 FLAG_NOT_TOUCH_MODAL 必须要设置 FLAG_NOT_FOCUSABLE，否则就会导致用户按返回键无效
+        mWindowParams.flags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+    }
+
     /**
      * 是否有这个标志位
      */
@@ -406,6 +406,16 @@ public void update() {
         mWindowManager.updateViewLayout(mRootView, mWindowParams);
     }
 
+    /**
+     * 回收
+     */
+    public void recycle() {
+        mContext = null;
+        mWindowManager = null;
+        mListener = null;
+        mDraggable = null;
+    }
+
     /**
      * 当前是否已经显示
      */