6.9.8 update

- 新增队列事物执行器 QueueWorks，可通过 `.addWork(BaseActivityClass, QueueWorks)` 来为未启动的 BaseActivity 添加待执行事件，或者对已启动的 BaseActivity 添加依次执行事件，事件会在 BaseActivity 处于前台时执行；添加事件也可以通过 `BaseActivity.runWork(BaseActivityClass, QueueWorks)` 来添加。此外请注意，每执行完成一个事件后需要调用 QueueWorks 中的方法 `finishWork()` 才可以执行接下来的事件。 - 完善 QueueWorks 逻辑，提供 DEBUGMODE 日志开关以及 `cleanWorking(activityClass)` 清理执行中任务的逻辑。
kongzue · Mar 19, 2024 · baae50c · baae50c
1 parent 399f30a
commit baae50c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.kongzue.baseframeworkdemo"
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode 136
-        versionName "6.9.7"
+        versionCode 137
+        versionName "6.9.8"
     }
     buildTypes {
         release {

diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
@@ -10,6 +10,7 @@
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
@@ -139,6 +140,17 @@ public void killAllActivity() {
         }
     }
 
+    public void killAllActivity(Runnable whenAllActivityDestroyedRunnable) {
+        addWhenAllActivityDestroyedRunnable(whenAllActivityDestroyedRunnable);
+        if (activityStack != null) {
+            while (!activityStack.empty()) {
+                BaseActivity activity = currentActivity();
+                killActivity(activity);
+            }
+            activityStack.clear();
+        }
+    }
+
     /**
      * 退出应用程序
      */
@@ -172,6 +184,12 @@ public void deleteActivity(BaseActivity activity) {
         } catch (Exception e) {
 
         }
+        if (activityStack!=null && activityStack.isEmpty()){
+            for (Runnable runnable :whenAllActivityDestroyedRunnable){
+                runnable.run();
+            }
+            whenAllActivityDestroyedRunnable.clear();
+        }
     }
 
     /**
@@ -315,4 +333,10 @@ private static Application getApplicationContext() {
         }
         return null;
     }
+
+    List<Runnable> whenAllActivityDestroyedRunnable = new ArrayList<Runnable>();
+
+    public void addWhenAllActivityDestroyedRunnable(Runnable runnable){
+        whenAllActivityDestroyedRunnable.add(runnable);
+    }
 }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/QueueWorks.java b/baseframework/src/main/java/com/kongzue/baseframework/util/QueueWorks.java
@@ -20,10 +20,13 @@
  */
 public abstract class QueueWorks<A extends BaseActivity> {
 
+    public static boolean DEBUGMODE;
+
     private static Map<String, List<QueueWorks>> workBag = new HashMap<>();
     private static Set<String> working = new HashSet<>();
 
     public static void addWork(Class<? extends BaseActivity> clazz, QueueWorks works) {
+        log("addWork: " + clazz.getSimpleName() + " work=" + works);
         List<QueueWorks> worksList = workBag.get(clazz.getName());
         if (worksList == null) {
             worksList = new ArrayList<>();
@@ -34,23 +37,27 @@ public static void addWork(Class<? extends BaseActivity> clazz, QueueWorks works
     }
 
     public static void doNextWork(Class<? extends BaseActivity> clazz) {
+        log("doNextWork: " + clazz.getSimpleName());
         BaseActivity activity = AppManager.getInstance().getActivityInstance(clazz);
         List<QueueWorks> worksList = workBag.get(clazz.getName());
         if (activity != null && worksList != null && !worksList.isEmpty()) {
             if (working.contains(clazz.getName())) {
+                log("doNextWork: return! " + clazz.getSimpleName() + " is working!");
                 return;
             }
             working.add(clazz.getName());
             QueueWorks works = worksList.get(0);
             worksList.remove(works);
             if (activity.isActive) {
+                log("doNextWork: run: " + clazz.getSimpleName() + " ,activity isActive, works=" + works);
                 activity.runOnMain(new Runnable() {
                     @Override
                     public void run() {
                         works.callRun(activity);
                     }
                 });
             } else {
+                log("doNextWork: run: " + clazz.getSimpleName() + " ,activity isNotActive, runOnResume works=" + works);
                 activity.runOnResume(new Runnable() {
                     @Override
                     public void run() {
@@ -61,6 +68,10 @@ public void run() {
         }
     }
 
+    public static void cleanWorking(Class<? extends BaseActivity> clazz){
+        working.remove(clazz.getName());
+    }
+
     Class<? extends BaseActivity> runOnClass;
 
     private void callRun(A activity) {
@@ -85,4 +96,10 @@ public QueueWorks<A> setData(Object data) {
         this.data = data;
         return this;
     }
+
+    private static void log(String s) {
+        if(DEBUGMODE){
+            Log.w(">>>" ,"QueueWorks: " + s);
+        }
+    }
 }