From 8034dc7b6b43cdb13cbba6fe094bec0448a85813 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Mon, 14 Aug 2017 20:10:33 +0800
Subject: [PATCH] fix: RootAutomatorEngine.forceStop not working

---
 app/build.gradle                              |   4 +-
 app/src/main/assets/help/catalogue.json       |   5 +++
 .../assets/help/documentation/脚本引擎.md     |   2 +
 .../需要Root权限的自动操作函数.md             |   4 ++
 .../需要Root权限的触摸与多点触摸.md           |  22 +++++++---
 .../删除全部空间留言.js                       |  19 ++++----
 autojs/src/main/assets/binary/root_automator  | Bin 13668 -> 13668 bytes
 .../main/assets/modules/__RootAutomator__.js  |   2 +-
 autojs/src/main/assets/modules/__engines__.js |  13 +++---
 autojs/src/main/assets/modules/__general__.js |  12 ++---
 .../accessibility/SimpleActionAutomator.java  |   1 +
 .../autojs/engine/JavaScriptEngine.java       |   3 ++
 .../autojs/engine/RootAutomatorEngine.java    |  23 +++++++---
 .../autojs/runtime/api/ProcessShell.java      |   4 ++
 .../autojs/runtime/api/RootAutomator.java     |  41 ++++++++++++++----
 .../stardust/autojs/runtime/api/Shell.java    |  19 ++++++--
 .../stardust/autojs/util/ProcessUtils.java    |   2 +-
 17 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 55db92e7..9c21e662 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.stardust.scriptdroid"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 159
-        versionName "2.0.16 Beta"
+        versionCode 160
+        versionName "2.0.16 Alpha3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk {
diff --git a/app/src/main/assets/help/catalogue.json b/app/src/main/assets/help/catalogue.json
index ab01a3bd..b4d48365 100644
--- a/app/src/main/assets/help/catalogue.json
+++ b/app/src/main/assets/help/catalogue.json
@@ -69,6 +69,11 @@
       "type": "markdown",
       "path":"documentation"
     },
+    {
+      "title": "需要Root权限的触摸与多点触摸",
+      "type": "markdown",
+      "path":"documentation"
+    },
     {
       "title": "UI(用户界面)",
       "type": "markdown",
diff --git a/app/src/main/assets/help/documentation/脚本引擎.md b/app/src/main/assets/help/documentation/脚本引擎.md
index f0acfdcb..9e5872d6 100644
--- a/app/src/main/assets/help/documentation/脚本引擎.md
+++ b/app/src/main/assets/help/documentation/脚本引擎.md
@@ -41,6 +41,8 @@ engines模块包含了一些与脚本引擎有关的函数，包括运行其他
 
 停止所有正在运行的脚本并显示停止的脚本数量。包括当前脚本自身。
 
+### engines.myEngine()
+
 # ScriptExecution
 
 执行脚本时返回的对象，可以通过他获取执行的引擎、
diff --git a/app/src/main/assets/help/documentation/需要Root权限的自动操作函数.md b/app/src/main/assets/help/documentation/需要Root权限的自动操作函数.md
index d9ca0e29..15fb4bfe 100644
--- a/app/src/main/assets/help/documentation/需要Root权限的自动操作函数.md
+++ b/app/src/main/assets/help/documentation/需要Root权限的自动操作函数.md
@@ -1,9 +1,13 @@
+
+注意：本章节的函数在后续版本很可能有改动！请勿过分依赖本章节函数的副作用。推荐使用RootAutomator（见《需要Root权限的触摸与多点触摸》）代替本章的触摸函数。
+
 以下函数均需要root权限，可以实现任意位置的点击、滑动、长按、模拟物理按键等。
 
 这些函数通常首字母大写以表示其特殊的权限。  
 这些函数均不返回任何值。  
 并且，这些函数的执行是异步的、非实时的，在不同机型上所用的时间不同。脚本不会等待动作执行完成才继续执行。因此最好在每个函数之后加上适当的sleep来达到期望的效果。
 
+
 例如:
 ```
 Tap(100, 100);
diff --git a/app/src/main/assets/help/documentation/需要Root权限的触摸与多点触摸.md b/app/src/main/assets/help/documentation/需要Root权限的触摸与多点触摸.md
index 212e03de..2898bed5 100644
--- a/app/src/main/assets/help/documentation/需要Root权限的触摸与多点触摸.md
+++ b/app/src/main/assets/help/documentation/需要Root权限的触摸与多点触摸.md
@@ -10,7 +10,7 @@ var ra = RootAutomator(context);
 ### RootAutomator.tap(x, y\[, id\])
 * x \<Number\> 横坐标
 * y \<Number\> 纵坐标
-* id \<Number\> 多点触摸id。默认值为1，可以通过setDefaultId指定。
+* id \<Number\> 多点触摸id，可选，默认为1，可以通过setDefaultId指定。
 
 点击位置(x, y)。其中id是一个整数值，用于区分多点触摸，不同的id表示不同的"手指"，例如：
 ```
@@ -29,7 +29,7 @@ ra.exit();
 * x2 \<Number\> 滑动终点横坐标
 * y2 \<Number\> 滑动终点纵坐标
 * duration \<Number\> 滑动时长，单位毫秒，默认值为300
-* id \<Number\> 多点触摸id
+* id \<Number\> 多点触摸id，可选，默认为1
 
 模拟一次从(x1, y1)到(x2, y2)的时间为duration毫秒的滑动。
 
@@ -37,28 +37,36 @@ ra.exit();
 * x \<Number\> 横坐标
 * y \<Number\> 纵坐标
 * duration \<Number\> 按下时长
-* id \<Number\> 多点触摸id
+* id \<Number\> 多点触摸id，可选，默认为1
 
 模拟按下位置(x, y)，时长为duration毫秒。
 
+### RootAutomator.longPress(x, y[\, id\])
+* x \<Number\> 横坐标
+* y \<Number\> 纵坐标
+* duration \<Number\> 按下时长
+* id \<Number\> 多点触摸id，可选，默认为1
+
+模拟长按位置(x, y)。
+
 以上为简单模拟触摸操作的函数。如果要模拟一些复杂的手势，需要更底层的函数。
 
 ### RootAutomator.touchDown(x, y[\, id\])
 * x \<Number\> 横坐标
 * y \<Number\> 纵坐标
-* id \<Number\> 多点触摸id
+* id \<Number\> 多点触摸id，可选，默认为1
 
 模拟手指按下位置(x, y)。
 
 ### RootAutomator.touchMove(x, y[\, id\])
 * x \<Number\> 横坐标
 * y \<Number\> 纵坐标
-* id \<Number\> 多点触摸id
+* id \<Number\> 多点触摸id，可选，默认为1
 
 模拟移动手指到位置(x, y)。
 
-### RootAutomator.touchUp([\id\])
-* id \<Number\> 多点触摸id
+### RootAutomator.touchUp(\[id\])
+* id \<Number\> 多点触摸id，可选，默认为1
 
 模拟手指弹起。
 
diff --git a/app/src/main/assets/sample/需要Root权限的自动操作/删除全部空间留言.js b/app/src/main/assets/sample/需要Root权限的自动操作/删除全部空间留言.js
index fcd82996..4f36bedd 100644
--- a/app/src/main/assets/sample/需要Root权限的自动操作/删除全部空间留言.js
+++ b/app/src/main/assets/sample/需要Root权限的自动操作/删除全部空间留言.js
@@ -1,27 +1,28 @@
-"auto";
+var ra = new RootAutomator();
+ra.setScreenMetrics(1080, 1920);
 
-setScreenMetrics(1080, 1920);
 launchApp("QQ");
 
 sleep(1500);
 
 //点击动态图标
-Tap(891, 1851);
+ra.tap(891, 1851);
 //点击好友动态
-Tap(192, 453);
+ra.tap(192, 453);
 //点击头像
-Tap(155, 638);
+ra.tap(155, 638);
 //点击留言
-Tap(747, 775);
+ra.tap(747, 775);
 
 while(true){
     if(currentPackage() == 'com.tencent.mobileqq'){
         //点击箭头图标
-        Tap(1029, 433);
+        ra.tap(1029, 433);
         //点击删除
-        Tap(530, 820);
+        ra.tap(530, 820);
         //点击确定
-        Tap(331, 1122);
+        ra.tap(331, 1122);
     }
     sleep(200);
 }
+
diff --git a/autojs/src/main/assets/binary/root_automator b/autojs/src/main/assets/binary/root_automator
index 2fcfbcc5d8b5f39164c309d99cdf8a70d54c24de..4e296d1497ea848e1f54ef028a6c90b60a4f33cf 100644
GIT binary patch
delta 5199
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
E04&jFNB{r;

delta 4790
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

diff --git a/autojs/src/main/assets/modules/__RootAutomator__.js b/autojs/src/main/assets/modules/__RootAutomator__.js
index 31669b09..3bc1acf8 100644
--- a/autojs/src/main/assets/modules/__RootAutomator__.js
+++ b/autojs/src/main/assets/modules/__RootAutomator__.js
@@ -2,7 +2,7 @@ module.exports = function(__runtime__, scope){
     function RootAutomator(){
          this.__ra__ = Object.create(new com.stardust.autojs.runtime.api.RootAutomator(scope.context));
         var methods = ["sendEvent", "touch", "setScreenMetrics", "touchX", "touchY", "sendSync",  "sendMtSync", "tap",
-            "swipe","touchDown", "touchUp", "touchMove", "getDefaultId", "setDefaultId", "exit"];
+            "swipe", "press", "longPress", "touchDown", "touchUp", "touchMove", "getDefaultId", "setDefaultId", "exit"];
         for(var i = 0; i < methods.length; i++){
             var method = methods[i];
             this[method] = this.__ra__[method].bind(this.__ra__);
diff --git a/autojs/src/main/assets/modules/__engines__.js b/autojs/src/main/assets/modules/__engines__.js
index cd1d532e..b491308f 100644
--- a/autojs/src/main/assets/modules/__engines__.js
+++ b/autojs/src/main/assets/modules/__engines__.js
@@ -5,18 +5,19 @@ module.exports = function(__runtime__, scope){
     var engines = {};
 
     engines.execScript = function(name, script, config){
-        config = fillConfig(config);
-        return rtEngines.execScript(name, script, config);
+        return rtEngines.execScript(name, script, fillConfig(config));
     }
 
     engines.execScriptFile = function(path, config){
-        config = fillConfig(config);
-        return rtEngines.execScriptFile(path, config);
+        return rtEngines.execScriptFile(path, fillConfig(config));
     }
 
     engines.execAutoFile = function(path, config){
-        config = fillConfig(config);
-        return rtEngines.execAutoFile(path, config);
+        return rtEngines.execAutoFile(path, fillConfig(config));
+    }
+
+    engines.myEngine = function(){
+        return scope.__engine__;
     }
 
     engines.stopAll = rtEngines.stopAll.bind(rtEngines);
diff --git a/autojs/src/main/assets/modules/__general__.js b/autojs/src/main/assets/modules/__general__.js
index 94768a3f..996b6dca 100644
--- a/autojs/src/main/assets/modules/__general__.js
+++ b/autojs/src/main/assets/modules/__general__.js
@@ -45,17 +45,17 @@ module.exports = function(__runtime__, scope){
         return __runtime__.info.getLatestActivity();
     }
 
-    scope.waitForActivity = function(activity, delay){
-        delay = delay || 200;
+    scope.waitForActivity = function(activity, period){
+        period = period || 200;
         while(scope.currentActivity() != activity){
-            sleep(delay);
+            sleep(period);
         }
     }
 
-    scope.waitForPackage = function(packageName, delay){
-        delay = delay || 200;
+    scope.waitForPackage = function(packageName, period){
+        period = period || 200;
         while(scope.currentPackage() != packageName){
-            sleep(delay);
+            sleep(period);
         }
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
index c9c4eaca..f0ef7e52 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
@@ -245,6 +245,7 @@ public class SimpleActionAutomator {
         mAccessibilityBridge.ensureServiceEnabled();
     }
 
+
     @SuppressWarnings("unchecked")
     private boolean performAction(SimpleAction simpleAction) {
         ensureAccessibilityServiceEnabled();
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
index 894c01f0..7b1f68a7 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java
@@ -28,6 +28,9 @@ public abstract class JavaScriptEngine extends ScriptEngine.AbstractScriptEngine
     }
 
     public void setRuntime(ScriptRuntime runtime) {
+        if (mRuntime != null) {
+            throw new IllegalStateException("a runtime has been set");
+        }
         mRuntime = runtime;
         put("__runtime__", runtime);
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
index 8b5daaf2..41d78e61 100644
--- a/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
+++ b/autojs/src/main/java/com/stardust/autojs/engine/RootAutomatorEngine.java
@@ -7,7 +7,10 @@ import android.util.Log;
 import com.stardust.autojs.runtime.api.AbstractShell;
 import com.stardust.autojs.runtime.api.ProcessShell;
 import com.stardust.autojs.core.inputevent.InputDevices;
+import com.stardust.autojs.runtime.api.Shell;
+import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
 import com.stardust.autojs.script.AutoFileSource;
+import com.stardust.concurrent.VolatileBox;
 import com.stardust.pio.PFile;
 
 import java.io.File;
@@ -34,7 +37,6 @@ public class RootAutomatorEngine extends ScriptEngine.AbstractScriptEngine<AutoF
     public RootAutomatorEngine(Context context, String deviceNameOrPath) {
         mContext = context;
         mDeviceNameOrPath = getDeviceNameOrPath(context, deviceNameOrPath);
-
     }
 
 
@@ -42,14 +44,14 @@ public class RootAutomatorEngine extends ScriptEngine.AbstractScriptEngine<AutoF
         this(context, InputDevices.getTouchDeviceName());
     }
 
-    public AbstractShell.Result execute(String autoFile) {
+    public void execute(String autoFile) {
         mExecutablePath = getExecutablePath(mContext);
-        AbstractShell.Result r = ProcessShell.execCommand(new String[]{
+        Log.d(LOG_TAG, "exec: " + autoFile);
+        AbstractShell.Result result = ProcessShell.execCommand(new String[]{
                 "chmod 777 " + mExecutablePath,
                 mExecutablePath + " \"" + autoFile + "\" -d " + mDeviceNameOrPath
         }, true);
-        Log.d(LOG_TAG, "exec: " + autoFile + " result:" + r);
-        return r;
+        Log.d(LOG_TAG, "result = " + result);
     }
 
 
@@ -90,17 +92,24 @@ public class RootAutomatorEngine extends ScriptEngine.AbstractScriptEngine<AutoF
 
     @Override
     public Object execute(AutoFileSource source) {
-        return execute(source.getFile().getAbsolutePath());
+        execute(source.getFile().getAbsolutePath());
+        return null;
     }
 
     @Override
     public void forceStop() {
-        ProcessShell.exec("killall " + mExecutablePath, true);
         mThread.interrupt();
+        ProcessShell.exec("killall " + mExecutablePath, true);
     }
 
     @Override
     public void init() {
         mThread = Thread.currentThread();
     }
+
+    @Override
+    public synchronized void destroy() {
+        super.destroy();
+        Log.d(LOG_TAG, "Shell exit");
+    }
 }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java
index f156986f..6ceb6d93 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java
@@ -68,6 +68,7 @@ public class ProcessShell extends AbstractShell {
     @Override
     public void exit() {
         if (mProcess != null) {
+            Log.d(TAG, "exit: pid = " + ProcessUtils.getProcessPid(mProcess));
             mProcess.destroy();
             mProcess = null;
         }
@@ -195,11 +196,14 @@ public class ProcessShell extends AbstractShell {
             }
             os.writeBytes(COMMAND_EXIT);
             os.flush();
+            Log.d(TAG, "pid = " + ProcessUtils.getProcessPid(process));
             commandResult.code = process.waitFor();
             commandResult.result = readAll(process.getInputStream());
             commandResult.error = readAll(process.getErrorStream());
             Log.d(TAG, commandResult.toString());
         } catch (Exception e) {
+            commandResult.code = -1;
+            commandResult.error = e.getMessage();
             e.printStackTrace();
         } finally {
             try {
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/RootAutomator.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/RootAutomator.java
index 8a9ab261..aa164194 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/RootAutomator.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/RootAutomator.java
@@ -3,22 +3,26 @@ package com.stardust.autojs.runtime.api;
 import android.content.Context;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.InputDevice;
+import android.view.ViewConfiguration;
 
 import com.stardust.autojs.core.inputevent.InputDevices;
 import com.stardust.autojs.engine.RootAutomatorEngine;
-import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
-import com.stardust.pio.UncheckedIOException;
 import com.stardust.util.ScreenMetrics;
 
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 
-import static com.stardust.autojs.core.inputevent.InputEventCodes.*;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.ABS_MT_POSITION_X;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.ABS_MT_POSITION_Y;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.ABS_MT_TOUCH_MAJOR;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.ABS_MT_TRACKING_ID;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.BTN_TOOL_FINGER;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.BTN_TOUCH;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.EV_ABS;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.EV_KEY;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.EV_SYN;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.SYN_MT_REPORT;
+import static com.stardust.autojs.core.inputevent.InputEventCodes.SYN_REPORT;
 
 /**
  * Created by Stardust on 2017/7/16.
@@ -124,6 +128,24 @@ public class RootAutomator {
         swipe(x1, y1, x2, y2, 300, mDefaultId);
     }
 
+    public void press(int x, int y, int duration, int id) throws IOException {
+        touchDown(x, y, id);
+        sleep(duration);
+        touchUp(id);
+    }
+
+    public void press(int x, int y, int duration) throws IOException {
+        press(x, y, duration, getDefaultId());
+    }
+
+    public void longPress(int x, int y, int id) throws IOException {
+        press(x, y, ViewConfiguration.getLongPressTimeout() + 200, id);
+    }
+
+    public void longPress(int x, int y) throws IOException {
+        press(x, y, ViewConfiguration.getLongPressTimeout() + 200, getDefaultId());
+    }
+
     public void touchDown(int x, int y, int id) throws IOException {
         sendEvent(EV_ABS, ABS_MT_TRACKING_ID, id);
         sendEvent(EV_KEY, BTN_TOUCH, 0x00000001);
@@ -168,10 +190,11 @@ public class RootAutomator {
         mDefaultId = defaultId;
     }
 
-    private void sleep(long duration) {
+    private void sleep(long duration) throws IOException {
         try {
             Thread.sleep(duration);
         } catch (InterruptedException e) {
+            exit();
             throw new ScriptInterruptedException();
         }
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Shell.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Shell.java
index e7a76632..22581fb4 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Shell.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Shell.java
@@ -69,6 +69,7 @@ public class Shell extends AbstractShell {
     private volatile RuntimeException mInitException;
     private volatile boolean mInitialized = false;
     private volatile boolean mWaitingExit = false;
+    private final boolean mShouldReadOutput;
     private Callback mCallback;
 
     public Shell(Context context) {
@@ -76,7 +77,12 @@ public class Shell extends AbstractShell {
     }
 
     public Shell(Context context, boolean root) {
+        this(context, root, true);
+    }
+
+    public Shell(Context context, boolean root, boolean shouldReadOutput) {
         super(context, root);
+        mShouldReadOutput = shouldReadOutput;
     }
 
     public Shell() {
@@ -96,7 +102,7 @@ public class Shell extends AbstractShell {
                 TermSettings settings = new TermSettings(mContext.getResources(), PreferenceManager.getDefaultSharedPreferences(mContext));
                 try {
                     mTermSession = new MyShellTermSession(settings, initialCommand);
-                    mTermSession.initializeEmulator(40, 40);
+                    mTermSession.initializeEmulator(1024, 40);
                 } catch (IOException e) {
                     mInitException = new UncheckedIOException(e);
                 }
@@ -181,6 +187,9 @@ public class Shell extends AbstractShell {
         }
     }
 
+    public TermSession getTermSession() {
+        return mTermSession;
+    }
 
     private class MyShellTermSession extends ShellTermSession {
 
@@ -193,7 +202,9 @@ public class Shell extends AbstractShell {
             PipedInputStream pipedInputStream = new PipedInputStream(8192);
             mBufferedReader = new BufferedReader(new InputStreamReader(pipedInputStream));
             mOutputStream = new PipedOutputStream(pipedInputStream);
-            startReadingThread();
+            if (mShouldReadOutput) {
+                startReadingThread();
+            }
         }
 
         private void startReadingThread() {
@@ -215,7 +226,7 @@ public class Shell extends AbstractShell {
         }
 
         private void onNewLine(String line) {
-            Log.d(TAG, line);
+            //Log.d(TAG, line);
             if (!mInitialized) {
                 if (isRoot() && line.endsWith(" $ su")) {
                     notifyInitialized();
@@ -277,6 +288,8 @@ public class Shell extends AbstractShell {
         @Override
         public void finish() {
             super.finish();
+            if (!mShouldReadOutput)
+                return;
             mReadingThread.interrupt();
             try {
                 mBufferedReader.close();
diff --git a/autojs/src/main/java/com/stardust/autojs/util/ProcessUtils.java b/autojs/src/main/java/com/stardust/autojs/util/ProcessUtils.java
index 130ac783..4deee6a2 100644
--- a/autojs/src/main/java/com/stardust/autojs/util/ProcessUtils.java
+++ b/autojs/src/main/java/com/stardust/autojs/util/ProcessUtils.java
@@ -24,7 +24,7 @@ public class ProcessUtils {
 
     }
 
-    private static int getProcessPid(Process process) {
+    public static int getProcessPid(Process process) {
         try {
             Field pid = process.getClass().getDeclaredField("pid");
             pid.setAccessible(true);