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

fix: files.cwd()

Browse Source
This commit is contained in:
hyb1996
2018-01-07 13:41:46 +08:00
parent 13aa6ed341
commit 130827cab5
9 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/stardust/scriptdroid/external/ScriptIntents.java vendored
View File

@@ -49,9 +49,9 @@ public class ScriptIntents {
} else {
source = fileScriptSource;
}
config.path(new File(path).getParent(), StorageFileProvider.DEFAULT_DIRECTORY_PATH);
config.executePath(new File(path).getParent());
} else {
config.path(StorageFileProvider.DEFAULT_DIRECTORY_PATH);
config.executePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH);
}
if (source == null) {
return false;

23
app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java
View File

@@ -9,6 +9,7 @@ import com.stardust.autojs.execution.ScriptExecution;
import com.stardust.autojs.execution.ScriptExecutionListener;
import com.stardust.autojs.execution.SimpleScriptExecutionListener;
import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
import com.stardust.autojs.script.JavaScriptFileSource;
import com.stardust.autojs.script.ScriptSource;
import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.R;
@@ -91,35 +92,27 @@ public class Scripts {
}
public static ScriptExecution run(ScriptFile file) {
return run(file.toSource(), file.getParent());
return AutoJs.getInstance().getScriptEngineService().execute(new JavaScriptFileSource(file), new ExecutionConfig()
.executePath(file.getParent()));
}
public static ScriptExecution run(ScriptSource source, String directoryPath) {
return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig()
.path(directoryPath, StorageFileProvider.DEFAULT_DIRECTORY_PATH));
}
public static ScriptExecution run(ScriptSource source) {
return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig()
.path(StorageFileProvider.DEFAULT_DIRECTORY_PATH));
.executePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH));
}
public static ScriptExecution runWithBroadcastSender(ScriptSource scriptSource, String directoryPath) {
return AutoJs.getInstance().getScriptEngineService().execute(scriptSource, BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER,
new ExecutionConfig().path(directoryPath, StorageFileProvider.DEFAULT_DIRECTORY_PATH));
public static ScriptExecution runWithBroadcastSender(File file) {
return AutoJs.getInstance().getScriptEngineService().execute(new JavaScriptFileSource(file), BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER,
new ExecutionConfig().executePath(file.getParent()));
}
public static ScriptExecution runWithBroadcastSender(ScriptSource source) {
return AutoJs.getInstance().getScriptEngineService().execute(source, BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER,
new ExecutionConfig().path(StorageFileProvider.DEFAULT_DIRECTORY_PATH));
}
public static ScriptExecution runRepeatedly(ScriptFile scriptFile, int loopTimes, long delay, long interval) {
ScriptSource source = scriptFile.toSource();
String directoryPath = scriptFile.getParent();
return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig()
.path(directoryPath, StorageFileProvider.DEFAULT_DIRECTORY_PATH)
.executePath(directoryPath)
.loop(delay, loopTimes, interval));
}

2
app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java
View File

@@ -278,7 +278,7 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC
public void run() {
Snackbar.make(this, R.string.text_start_running, Snackbar.LENGTH_SHORT).show();
mScriptExecution = Scripts.runWithBroadcastSender(new JavaScriptFileSource(mName, mFile), mFile.getParent());
mScriptExecution = Scripts.runWithBroadcastSender(mFile);
setMenuItemStatus(R.id.run, false);
}