From 8efb74eae00e69ee0651ae0e1ed01dede12f5dc4 Mon Sep 17 00:00:00 2001 From: TonyJiangWJ Date: Sat, 26 Dec 2020 12:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/stardust/autojs/runtime/ScriptRuntime.java | 1 + .../main/java/com/stardust/autojs/runtime/api/Images.java | 5 ++++- settings.gradle | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java index 6158c18d..679a9205 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java @@ -424,6 +424,7 @@ public class ScriptRuntime { }); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { ignoresException(images::releaseScreenCapturer); + ignoresException(images::recycle); } ignoresException(sensors::unregisterAll); ignoresException(timers::recycle); diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java index 322a8238..e1e71d42 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java @@ -267,7 +267,6 @@ public class Images { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && mScreenCapturer != null) { mScreenCapturer.release(); } - mScriptRuntime = null; } public Point findImage(ImageWrapper image, ImageWrapper template) { @@ -366,4 +365,8 @@ public class Images { } } + + public void recycle() { + mScriptRuntime = null; + } } diff --git a/settings.gradle b/settings.gradle index f65eecc8..6c164af4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ include ':app', ':automator', ':common', ':autojs', ':inrt', ':autojs-tool-color-center' include ':autojs-tool-download' include ':autojs-tool-webview' +include ':autojs-tool-encrypt'