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

fix: dialogs.select() arguments' parsing

Browse Source
This commit is contained in:
hyb1996
2017-12-07 22:46:16 +08:00
parent be023ceefe
commit e6811c2f5a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ module.exports = function(__runtime__, scope){
} }
return rtDialogs().select(title, items, callback ? callback : null); return rtDialogs().select(title, items, callback ? callback : null);
} }
return rtDialogs().select(title, [].slice.call(arguments, 1)); return rtDialogs().select(title, [].slice.call(arguments, 1), null);
} }
dialogs.singleChoice = function(title, items, index, callback){ dialogs.singleChoice = function(title, items, index, callback){

8
autojs/src/main/java/com/stardust/autojs/runtime/api/Dialogs.java
View File

@@ -77,9 +77,7 @@ public class Dialogs {
} }
@ScriptInterface @ScriptInterface
public Object select(String title, Object... args) { public Object select(String title, String[] items, Object callback) {
Object callback = getCallback(args);
String[] items = getItems(args);
return ((BlockedMaterialDialog.Builder) dialogBuilder(callback) return ((BlockedMaterialDialog.Builder) dialogBuilder(callback)
.itemsCallback() .itemsCallback()
.title(title) .title(title)
@@ -152,8 +150,8 @@ public class Dialogs {
} }
@ScriptInterface @ScriptInterface
public int select(String title, Object... args) { public int select(String title, String[] items, Object callback) {
return (Integer) Dialogs.this.select(title, args); return (Integer) Dialogs.this.select(title, items, callback);
} }
@ScriptInterface @ScriptInterface