fix(autojs): EventEmitter.once(), view._id() ; feat(autojs): auto.getService(), auto.getWindows(), auto.setWindowFilter(), util.java.toJsArray()

This commit is contained in:
hyb1996
2018-09-09 21:37:53 +08:00
parent e09966505c
commit 769529585d
13 changed files with 82 additions and 18 deletions

View File

@@ -109,18 +109,18 @@ module.exports = function(runtime, global){
"fast": 1
}
global.auto = function(mode){
var auto = function(mode){
if(mode){
global.auto.setMode(mode);
}
runtime.accessibilityBridge.ensureServiceEnabled();
}
global.auto.waitFor = function(){
auto.waitFor = function(){
runtime.accessibilityBridge.waitForServiceEnabled();
}
global.auto.setMode = function(mode){
auto.setMode = function(mode){
if(typeof(mode) !== "string"){
throw new TypeError("mode should be a string");
}
@@ -128,6 +128,25 @@ module.exports = function(runtime, global){
runtime.accessibilityBridge.setMode(mode);
}
auto.getService = function(){
return runtime.accessibilityBridge.getService();
}
auto.getWindows = function(){
var service = auto.getService();
return service == null ? [] : util.java.toJsArray(service.getWindows(), true);
}
auto.getRoot = function(){
var root = runtime.accessibilityBridge.getRootInCurrentWindow();
return com.stardust.automator.UiObject.createRoot(root);
}
auto.setWindowFilter = function(filter){
runtime.accessibilityBridge.setWindowFilter(new com.stardust.autojs.core.accessibility.AccessibilityBridge.WindowFilter(filter));
}
global.auto = auto;
global.__asGlobal__(runtime.automator, ['back', 'home', 'powerDialog', 'notifications', 'quickSettings', 'recents', 'splitScreen']);
global.__asGlobal__(automator, ['click', 'longClick', 'press', 'swipe', 'gesture', 'gestures', 'gestureAsync', 'gesturesAsync', 'scrollDown', 'scrollUp', 'input', 'setText']);

View File

@@ -32,4 +32,18 @@ function array(type) {
J.array = array;
J.toJsArray = function(list, nullListToEmptyArray){
if(list == null || list == undefined){
if(nullListToEmptyArray){
return [];
}
return null;
}
let arr = Array(list.size());
for(let i = 0; i < list.size(); i++){
arr[i] = list.get(i);
}
return arr;
}
module.exports = J;

View File

@@ -267,7 +267,7 @@ module.exports = function (runtime, global) {
});
}
view._id = function (id) {
return ui.findById(view, id);
return ui.findByStringId(view, id);
}
view.click = function (listener) {
if (listener) {