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

add: jump, find, replace, copy, paste for editor

Browse Source
This commit is contained in:
hyb1996
2017-09-28 21:09:16 +08:00
parent 8f3d88c94c
commit e1f95c09f3
23 changed files with 721 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,9 @@ package com.stardust.scriptdroid.script;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.support.annotation.Nullable;
import com.stardust.autojs.engine.RhinoJavaScriptEngine;
import com.stardust.autojs.execution.ExecutionConfig;
import com.stardust.autojs.execution.ScriptExecution;
import com.stardust.autojs.execution.ScriptExecutionListener;
@@ -21,6 +23,8 @@ import com.stardust.scriptdroid.script.sample.Sample;
import com.stardust.scriptdroid.ui.edit.EditActivity;
import com.stardust.util.AssetsCache;
import org.mozilla.javascript.RhinoException;
import java.io.File;
/**
@@ -31,6 +35,8 @@ public class Scripts {
public static final String ACTION_ON_EXECUTION_FINISHED = "Don't leave me alone...";
public static final String EXTRA_EXCEPTION_MESSAGE = "Say something...Eating...17.5.3";
public static final String EXTRA_EXCEPTION_LINE_NUMBER = "Can we fall in love with each other again...17.9.28";
public static final String EXTRA_EXCEPTION_COLUMN_NUMBER = "I lost myself....";
private static final ScriptExecutionListener BROADCAST_SENDER_SCRIPT_EXECUTION_LISTENER = new SimpleScriptExecutionListener() {
@@ -41,11 +47,21 @@ public class Scripts {
@Override
public void onException(ScriptExecution execution, Exception e) {
RhinoException rhinoException = getRhinoException(e);
int line = -1, col = 0;
if (rhinoException != null) {
line = rhinoException.lineNumber();
col = rhinoException.columnNumber();
}
if (ScriptInterruptedException.causedByInterrupted(e)) {
App.getApp().sendBroadcast(new Intent(ACTION_ON_EXECUTION_FINISHED));
App.getApp().sendBroadcast(new Intent(ACTION_ON_EXECUTION_FINISHED)
.putExtra(EXTRA_EXCEPTION_LINE_NUMBER, line)
.putExtra(EXTRA_EXCEPTION_COLUMN_NUMBER, col));
} else {
App.getApp().sendBroadcast(new Intent(ACTION_ON_EXECUTION_FINISHED)
.putExtra(EXTRA_EXCEPTION_MESSAGE, e.getMessage()));
.putExtra(EXTRA_EXCEPTION_MESSAGE, e.getMessage())
.putExtra(EXTRA_EXCEPTION_LINE_NUMBER, line)
.putExtra(EXTRA_EXCEPTION_COLUMN_NUMBER, col));
}
}
@@ -114,4 +130,15 @@ public class Scripts {
.path(directoryPath, StorageFileProvider.DEFAULT_DIRECTORY_PATH)
.loop(delay, loopTimes, interval));
}
@Nullable
public static RhinoException getRhinoException(Throwable e) {
while (e != null) {
if (e instanceof RhinoException) {
return (RhinoException) e;
}
e = e.getCause();
}
return null;
}
}