把中断接口放到容器中

README.md

@@ -16,7 +16,7 @@ repositories {
 
 ```groovy
 dependencies {
-        implementation 'com.github.EKwongChum:EkPopWindow:1.2.1'
+        implementation 'com.github.EKwongChum:EkPopWindow:1.2.2'
     }
 ```
 

build.gradle

@@ -24,8 +24,8 @@ allprojects {
         $minSdkVersion = 21
         $compileSdkVersion = 28
         $supportVersion = "28.0.0"
-        $versionCode = 5
-        $versionName = "1.2.1"
+        $versionCode = 6
+        $versionName = "1.2.2"
     }
 }
 

ekpopwindowlib/src/main/java/com/ekwong/lib/EkPopWindow.java

@@ -4,6 +4,8 @@
 import android.view.View;
 
 import com.ekwong.ekpopwindowlib.R;
+import com.ekwong.lib.interrupt.BackInterruption;
+import com.ekwong.lib.interrupt.Interruption;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -29,7 +31,7 @@ public abstract class EkPopWindow {
 
     private Set<BackPressedListener> backPressedListeners = new HashSet<>();
 
-    private Set<BackInterruption> backInterruptions = new HashSet<>();
+    private Interruption interruption = new Interruption();
 
     public EkPopWindow(Context context, int resLayout, View decorView) {
         mContext = context;
@@ -54,13 +56,10 @@ public boolean removeBackPressedListener(BackPressedListener listener) {
         return backPressedListeners.remove(listener);
     }
 
-    public boolean addBackInterruption(BackInterruption interruption) {
-        return backInterruptions.add(interruption);
+    public boolean addBackInterruption(BackInterruption backInterruption) {
+        return interruption.addBackInterruption(backInterruption);
     }
 
-    public boolean removeBackInterruption(BackInterruption interruption) {
-        return backInterruptions.remove(interruption);
-    }
 
     /**
      * 设置弹窗的配置
@@ -118,10 +117,8 @@ public boolean isShow() {
      * 当返回按钮被点击的时候调用
      */
     public void onBackPressed() {
-        if (!backInterruptions.isEmpty()) {
-            for (BackInterruption listener : backInterruptions) {
-                listener.interrupt();
-            }
+        if (interruption.isEnable()) {
+            interruption.exec();
         } else {
             if (!backPressedListeners.isEmpty()) {
                 for (BackPressedListener listener : backPressedListeners) {

ekpopwindowlib/src/main/java/com/ekwong/lib/BackInterruption.java → ekpopwindowlib/src/main/java/com/ekwong/lib/interrupt/BackInterruption.java

@@ -1,4 +1,4 @@
-package com.ekwong.lib;
+package com.ekwong.lib.interrupt;
 
 /**
  * @author ekwong

ekpopwindowlib/src/main/java/com/ekwong/lib/interrupt/Interruption.java

@@ -0,0 +1,27 @@
+package com.ekwong.lib.interrupt;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author ekwong
+ */
+public class Interruption {
+
+    private Set<BackInterruption> backInterruptions = new HashSet<>();
+
+    public boolean addBackInterruption(BackInterruption interruption) {
+        return backInterruptions.add(interruption);
+    }
+
+    public boolean isEnable() {
+        return !backInterruptions.isEmpty();
+    }
+
+    public void exec() {
+        for (BackInterruption interruption : backInterruptions) {
+            interruption.interrupt();
+        }
+        backInterruptions.clear();
+    }
+}