diff --git a/app-release-1.17.0221.apk b/app-release-1.17.0223.apk similarity index 64% rename from app-release-1.17.0221.apk rename to app-release-1.17.0223.apk index 86415098..26658ee9 100644 Binary files a/app-release-1.17.0221.apk and b/app-release-1.17.0223.apk differ diff --git a/app/build.gradle b/app/build.gradle index bc642454..f373cf13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 19 targetSdkVersion 23 - versionCode 31 - versionName "1.17.0221" + versionCode 34 + versionName "1.17.0223" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 81c7df88..99a39b44 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -90,9 +90,9 @@ + android:label="编辑脚本"> @@ -129,7 +129,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/javasccript_engine_init.js b/app/src/main/assets/javasccript_engine_init.js index 4568cc7a..f579d7c3 100644 --- a/app/src/main/assets/javasccript_engine_init.js +++ b/app/src/main/assets/javasccript_engine_init.js @@ -132,4 +132,8 @@ var getPackageName = function(){ var getActivityName = function(){ return droid.getActivityName(); +} + +var setClip = function(text){ + droid.setClip(text); } \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java b/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java index 8dc28667..88009d0f 100644 --- a/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java +++ b/app/src/main/java/com/stardust/scriptdroid/droid/runtime/DroidRuntime.java @@ -1,5 +1,8 @@ package com.stardust.scriptdroid.droid.runtime; +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -145,6 +148,15 @@ public class DroidRuntime implements IDroidRuntime { return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SET_TEXT, text)); } + public void setClip(final String text) { + mUIHandler.post(new Runnable() { + @Override + public void run() { + ((ClipboardManager) App.getApp().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText(TAG, text)); + } + }); + } + @Override public boolean paste(ActionTarget target) { return performAction(target.createAction(AccessibilityNodeInfo.ACTION_PASTE)); diff --git a/app/src/main/java/com/stardust/scriptdroid/droid/runtime/action/ActionPerformAccessibilityDelegate.java b/app/src/main/java/com/stardust/scriptdroid/droid/runtime/action/ActionPerformAccessibilityDelegate.java index cde13bba..344197e2 100644 --- a/app/src/main/java/com/stardust/scriptdroid/droid/runtime/action/ActionPerformAccessibilityDelegate.java +++ b/app/src/main/java/com/stardust/scriptdroid/droid/runtime/action/ActionPerformAccessibilityDelegate.java @@ -73,12 +73,14 @@ public class ActionPerformAccessibilityDelegate implements AccessibilityDelegate if (latestPackage == null) return; ActionPerformAccessibilityDelegate.latestPackage = latestPackage.toString(); - ComponentName componentName = new ComponentName(latestPackage.toString(), latestClass == null ? null : latestClass.toString()); + if(latestClass == null) + return; try { + ComponentName componentName = new ComponentName(latestPackage.toString(), latestClass.toString()); ActivityInfo activityInfo = App.getApp().getPackageManager().getActivityInfo(componentName, 0); ActionPerformAccessibilityDelegate.latestActivity = activityInfo.name; - } catch (PackageManager.NameNotFoundException ignored) { - + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); } } diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditAndRunIntentActivity.java b/app/src/main/java/com/stardust/scriptdroid/external/open/EditIntentActivity.java similarity index 83% rename from app/src/main/java/com/stardust/scriptdroid/ui/edit/EditAndRunIntentActivity.java rename to app/src/main/java/com/stardust/scriptdroid/external/open/EditIntentActivity.java index 9c786e44..84f874a7 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditAndRunIntentActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/external/open/EditIntentActivity.java @@ -1,4 +1,4 @@ -package com.stardust.scriptdroid.ui.edit; +package com.stardust.scriptdroid.external.open; import android.content.Intent; import android.os.Bundle; @@ -8,12 +8,13 @@ import android.widget.Toast; import com.stardust.scriptdroid.ui.BaseActivity; import com.stardust.scriptdroid.R; +import com.stardust.scriptdroid.ui.edit.EditActivity; /** * Created by Stardust on 2017/2/2. */ -public class EditAndRunIntentActivity extends BaseActivity { +public class EditIntentActivity extends BaseActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -24,6 +25,7 @@ public class EditAndRunIntentActivity extends BaseActivity { e.printStackTrace(); Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show(); } + finish(); } private void handleIntent() { diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/ImportIntentActivity.java b/app/src/main/java/com/stardust/scriptdroid/external/open/ImportIntentActivity.java similarity index 84% rename from app/src/main/java/com/stardust/scriptdroid/ui/edit/ImportIntentActivity.java rename to app/src/main/java/com/stardust/scriptdroid/external/open/ImportIntentActivity.java index e9efc9de..0176cace 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/ImportIntentActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/external/open/ImportIntentActivity.java @@ -1,10 +1,11 @@ -package com.stardust.scriptdroid.ui.edit; +package com.stardust.scriptdroid.external.open; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; +import android.widget.Toast; import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.scriptdroid.ui.BaseActivity; @@ -24,7 +25,13 @@ public class ImportIntentActivity extends BaseActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - handleIntent(); + try { + handleIntent(); + } catch (Exception e) { + e.printStackTrace(); + Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show(); + } + finish(); } private void handleIntent() { diff --git a/app/src/main/java/com/stardust/scriptdroid/external/open/RunIntentActivity.java b/app/src/main/java/com/stardust/scriptdroid/external/open/RunIntentActivity.java new file mode 100644 index 00000000..62e6ec0a --- /dev/null +++ b/app/src/main/java/com/stardust/scriptdroid/external/open/RunIntentActivity.java @@ -0,0 +1,40 @@ +package com.stardust.scriptdroid.external.open; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.text.TextUtils; +import android.widget.Toast; + +import com.stardust.scriptdroid.R; +import com.stardust.scriptdroid.external.shortcut.ShortcutActivity; + +/** + * Created by Stardust on 2017/2/22. + */ + +public class RunIntentActivity extends Activity { + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + try { + handleIntent(); + } catch (Exception e) { + e.printStackTrace(); + Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show(); + } + finish(); + } + + private void handleIntent() { + Intent intent = getIntent(); + String path = intent.getData().getPath(); + if (!TextUtils.isEmpty(path)) { + startActivity(new Intent(this, ShortcutActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + .putExtra("path", path)); + } + } +} diff --git a/app/src/main/java/com/stardust/scriptdroid/file/FileUtils.java b/app/src/main/java/com/stardust/scriptdroid/file/FileUtils.java index a6aea5e2..706bec3a 100644 --- a/app/src/main/java/com/stardust/scriptdroid/file/FileUtils.java +++ b/app/src/main/java/com/stardust/scriptdroid/file/FileUtils.java @@ -198,4 +198,17 @@ public class FileUtils { return false; } } + + public static String generateNotExistingPath(String path, String extension) { + if (!new File(path + extension).exists()) + return path + extension; + int i = 0; + while (true) { + String pathI = path + "(" + i + ")" + extension; + if (!new File(pathI).exists()) + return pathI; + i++; + } + + } } \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java index 219ca13c..33bdcdc1 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/CodeCompletion.java @@ -47,7 +47,7 @@ public class CodeCompletion implements TextWatcher { } interface OnCodeCompletionChangeListener { - void OnCodeCompletionChange(Collection list); + void OnCodeCompletionChange(Collection... list); } private static final String TAG = "CodeCompletion"; @@ -101,14 +101,14 @@ public class CodeCompletion implements TextWatcher { private static final String[] KEYWORDS = {"arguments", "break", "case", "catch", "class", "continue", "default", "do", "else", "eval", "export", "false", "for", "function", "if", "import", "in", "int", "new", "null", "package", "return", "switch", "this", "throw", "throws", "true", "try", "typeof", "var", "volatile", "while", "with", "Array", "Date", "hasOwnProperty", "Infinity", "isFinite", "isNaN", "isPrototypeOf", "length", "Math", "NaN", "name", "Number", "Object", "prototype", "String", "toString", "undefined", "valueOf"}; private static final int KEY_WORD_LENGTH_MAX = 15; - private static final String[] FUNCTIONS = {"toast", "launchPackage", "launch", "launchApp", "click", "longClick", "scrollUp", "scrollDown", "select", "focus", "paste", "input", "sleep", "isStopped", "notStopped", "log", "err", "openConsole", "clearConsole", "shell", "getTexts", "getPackageName", "getActivityName"}; + private static final String[] FUNCTIONS = {"toast", "launchPackage", "launch", "launchApp", "click", "longClick", "scrollUp", "scrollDown", "select", "focus", "paste", "input", "sleep", "isStopped", "notStopped", "log", "err", "openConsole", "clearConsole", "shell", "getTexts", "getPackageName", "getActivityName", "setClip"}; private boolean searchCodeCompletion(String str) { Collection c = searchWordCompletion(str); c.addAll(searchCodeCompletion(str, FUNCTIONS)); c.addAll(searchKeyWordCompletion(str)); if (c.size() > 0) { - mOnCodeCompletionChangeListener.OnCodeCompletionChange(c); + mOnCodeCompletionChangeListener.OnCodeCompletionChange(c, DEFAULT_CODE_COMPLETION_LIST); return true; } else { mOnCodeCompletionChangeListener.OnCodeCompletionChange(DEFAULT_CODE_COMPLETION_LIST); diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java index d2e8bd24..0e0f98e6 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/completion/InputMethodEnhanceBar.java @@ -68,9 +68,11 @@ public class InputMethodEnhanceBar extends RecyclerView implements CodeCompletio } @Override - public void OnCodeCompletionChange(Collection list) { + public void OnCodeCompletionChange(Collection... lists) { mCodeCompletionList.clear(); - mCodeCompletionList.addAll(list); + for (Collection list : lists) { + mCodeCompletionList.addAll(list); + } getAdapter().notifyDataSetChanged(); } diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/error/IssueReportActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/error/IssueReportActivity.java index 90353c0a..83128fdd 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/error/IssueReportActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/error/IssueReportActivity.java @@ -25,7 +25,6 @@ public class IssueReportActivity extends IssueReporterActivity { private boolean mCrash = false; private Method mReportIssue, mValidateInput; private boolean mReportFailed = false; - private String token = "d"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -129,7 +128,7 @@ public class IssueReportActivity extends IssueReporterActivity { @Override protected String getGuestToken() { //绕过github安全检查 - return decode("NDlkZDU3NjRiYTk3NzVmZDkxOTA3MDQ4YTdmNzQ1ZDY5NjcyNzEyNA=="); + return decode("MzA5MWJhNWI0NDM2NWYzOGRmNDA4ZWRhM2Y5MTUxN2ZlNDVlZDBhZQ=="); } public static String decode(String str) { diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java index 272bdff6..d8bb2566 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java @@ -163,10 +163,11 @@ public class MainActivity extends BaseActivity implements FileChooserDialog.File .input(getString(R.string.text_please_input_name), "", new MaterialDialog.InputCallback() { @Override public void onInput(@NonNull MaterialDialog dialog, CharSequence input) { - String path = ScriptFile.DEFAULT_FOLDER + input + ".js"; + String path = FileUtils.generateNotExistingPath(ScriptFile.DEFAULT_FOLDER + input, ".js"); MainActivity.this.createScriptFile(input.toString(), path, script); } - }).show(); + }) + .show(); } private void createScriptFile(String name, String path, String script) { diff --git a/app/src/main/res/raw/document.md b/app/src/main/res/raw/document.md index 012604de..82fcb14c 100644 --- a/app/src/main/res/raw/document.md +++ b/app/src/main/res/raw/document.md @@ -28,6 +28,7 @@ * `getTexts()` 获取屏幕上的文字列表, 返回一个java.util.List。例如： * `getPackageName` 获取正在运行的应用包名 * `getActivityName` 获取正在运行的Activity名称 +* `setClip(text)` 设置剪贴板文本 ``` launchApp("微信"); while(!click("通讯录")); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 18d404ec..27ff8cbe 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -124,4 +124,5 @@ 编辑 key_max_length_for_code_completion 代码补全最大文件长度 + 文件已存在 diff --git a/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java b/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java index 5330dc4b..fddb18fb 100644 --- a/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java +++ b/app/src/test/java/com/stardust/scriptdroid/ExampleUnitTest.java @@ -14,26 +14,6 @@ public class ExampleUnitTest { @Test public void testSync() throws Exception { - new Thread(new Runnable() { - @Override - public void run() { - while (true) { - synchronized (this) { - i++; - } - } - } - }).start(); - new Thread(new Runnable() { - @Override - public void run() { - while (true) { - synchronized (this) { - System.out.println(i); - } - } - } - }).start(); }