fix(ui): ui callbacks still alive after script exit

hellopyj · Apr 1, 2018 · e312977 · e312977
1 parent b3f000d
commit e312977
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/autojs/src/main/java/com/stardust/autojs/core/looper/Timer.java b/autojs/src/main/java/com/stardust/autojs/core/looper/Timer.java
@@ -112,4 +112,8 @@ public boolean hasPendingCallbacks() {
         return mMaxCallbackUptimeMillis > SystemClock.uptimeMillis();
     }
 
+    public void removeAllCallbacks() {
+        mHandler.removeCallbacksAndMessages(null);
+    }
+
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
@@ -373,6 +373,7 @@ public void onExit() {
             ignoresException(images::releaseScreenCapturer);
         }
         ignoresException(sensors::unregisterAll);
+        ignoresException(timers::recycle);
     }
 
     private void ignoresException(Runnable r) {

diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Timers.java
@@ -87,4 +87,8 @@ public boolean hasPendingCallbacks() {
         return getTimerForCurrentThread().hasPendingCallbacks();
     }
 
+    public void recycle(){
+        mMainTimer.removeAllCallbacks();
+    }
+
 }