tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: RootAutomatorEngine.forceStop not working

Browse Source
This commit is contained in:
hyb1996
2017-08-14 20:10:33 +08:00
parent 7b4629aa1d
commit 8034dc7b6b
17 changed files with 125 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
autojs/src/main/assets/binary/root_automator
View File

Binary file not shown.

2
autojs/src/main/assets/modules/__RootAutomator__.js
View File

@@ -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__);

13
autojs/src/main/assets/modules/__engines__.js
View File

@@ -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);

12
autojs/src/main/assets/modules/__general__.js
View File

@@ -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);
}
}