Added: setClip

This commit is contained in:
hyb1996
2017-02-23 22:40:52 +08:00
parent 8e3db7c7c3
commit 6ec0601373
17 changed files with 145 additions and 41 deletions

View File

@@ -7,8 +7,8 @@ android {
applicationId "com.stardust.scriptdroid" applicationId "com.stardust.scriptdroid"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 23 targetSdkVersion 23
versionCode 31 versionCode 34
versionName "1.17.0221" versionName "1.17.0223"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

View File

@@ -90,9 +90,9 @@
<service android:name=".service.VolumeChangeListenService"/> <service android:name=".service.VolumeChangeListenService"/>
<activity <activity
android:name=".ui.edit.EditAndRunIntentActivity" android:name=".external.open.EditIntentActivity"
android:icon="@drawable/ic_edit_green_48dp" android:icon="@drawable/ic_edit_green_48dp"
android:label="编辑与运行脚本"> android:label="编辑脚本">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
@@ -129,7 +129,47 @@
</activity> </activity>
<activity <activity
android:name=".ui.edit.ImportIntentActivity" android:name=".external.open.RunIntentActivity"
android:icon="@drawable/ic_play_green"
android:label="运行脚本">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.EDIT"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="file"/>
<data android:scheme="content"/>
<data android:mimeType="application/x-*"/>
<data android:mimeType="application/postscript"/>
<data android:mimeType="application/plain"/>
<data android:mimeType="application/x-javascript"/>
<data android:mimeType="text/*"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeType="text/*"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
<action android:name="com.googlecode.android_scripting.action.EDIT_SCRIPT"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".external.open.ImportIntentActivity"
android:icon="@drawable/ic_folder_open_outline_green" android:icon="@drawable/ic_folder_open_outline_green"
android:label="导入脚本文件"> android:label="导入脚本文件">

View File

@@ -132,4 +132,8 @@ var getPackageName = function(){
var getActivityName = function(){ var getActivityName = function(){
return droid.getActivityName(); return droid.getActivityName();
}
var setClip = function(text){
droid.setClip(text);
} }

View File

@@ -1,5 +1,8 @@
package com.stardust.scriptdroid.droid.runtime; 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.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -145,6 +148,15 @@ public class DroidRuntime implements IDroidRuntime {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SET_TEXT, text)); 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 @Override
public boolean paste(ActionTarget target) { public boolean paste(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_PASTE)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_PASTE));

View File

@@ -73,12 +73,14 @@ public class ActionPerformAccessibilityDelegate implements AccessibilityDelegate
if (latestPackage == null) if (latestPackage == null)
return; return;
ActionPerformAccessibilityDelegate.latestPackage = latestPackage.toString(); ActionPerformAccessibilityDelegate.latestPackage = latestPackage.toString();
ComponentName componentName = new ComponentName(latestPackage.toString(), latestClass == null ? null : latestClass.toString()); if(latestClass == null)
return;
try { try {
ComponentName componentName = new ComponentName(latestPackage.toString(), latestClass.toString());
ActivityInfo activityInfo = App.getApp().getPackageManager().getActivityInfo(componentName, 0); ActivityInfo activityInfo = App.getApp().getPackageManager().getActivityInfo(componentName, 0);
ActionPerformAccessibilityDelegate.latestActivity = activityInfo.name; ActionPerformAccessibilityDelegate.latestActivity = activityInfo.name;
} catch (PackageManager.NameNotFoundException ignored) { } catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
} }
} }

View File

@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.ui.edit; package com.stardust.scriptdroid.external.open;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -8,12 +8,13 @@ import android.widget.Toast;
import com.stardust.scriptdroid.ui.BaseActivity; import com.stardust.scriptdroid.ui.BaseActivity;
import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.ui.edit.EditActivity;
/** /**
* Created by Stardust on 2017/2/2. * Created by Stardust on 2017/2/2.
*/ */
public class EditAndRunIntentActivity extends BaseActivity { public class EditIntentActivity extends BaseActivity {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -24,6 +25,7 @@ public class EditAndRunIntentActivity extends BaseActivity {
e.printStackTrace(); e.printStackTrace();
Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.edit_and_run_handle_intent_error, Toast.LENGTH_LONG).show();
} }
finish();
} }
private void handleIntent() { private void handleIntent() {

View File

@@ -1,10 +1,11 @@
package com.stardust.scriptdroid.ui.edit; package com.stardust.scriptdroid.external.open;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.Toast;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.scriptdroid.ui.BaseActivity; import com.stardust.scriptdroid.ui.BaseActivity;
@@ -24,7 +25,13 @@ public class ImportIntentActivity extends BaseActivity {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(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() { private void handleIntent() {

View File

@@ -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));
}
}
}

View File

@@ -198,4 +198,17 @@ public class FileUtils {
return false; 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++;
}
}
} }

View File

@@ -47,7 +47,7 @@ public class CodeCompletion implements TextWatcher {
} }
interface OnCodeCompletionChangeListener { interface OnCodeCompletionChangeListener {
void OnCodeCompletionChange(Collection<CodeCompletionItem> list); void OnCodeCompletionChange(Collection<CodeCompletionItem>... list);
} }
private static final String TAG = "CodeCompletion"; 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 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 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) { private boolean searchCodeCompletion(String str) {
Collection<CodeCompletionItem> c = searchWordCompletion(str); Collection<CodeCompletionItem> c = searchWordCompletion(str);
c.addAll(searchCodeCompletion(str, FUNCTIONS)); c.addAll(searchCodeCompletion(str, FUNCTIONS));
c.addAll(searchKeyWordCompletion(str)); c.addAll(searchKeyWordCompletion(str));
if (c.size() > 0) { if (c.size() > 0) {
mOnCodeCompletionChangeListener.OnCodeCompletionChange(c); mOnCodeCompletionChangeListener.OnCodeCompletionChange(c, DEFAULT_CODE_COMPLETION_LIST);
return true; return true;
} else { } else {
mOnCodeCompletionChangeListener.OnCodeCompletionChange(DEFAULT_CODE_COMPLETION_LIST); mOnCodeCompletionChangeListener.OnCodeCompletionChange(DEFAULT_CODE_COMPLETION_LIST);

View File

@@ -68,9 +68,11 @@ public class InputMethodEnhanceBar extends RecyclerView implements CodeCompletio
} }
@Override @Override
public void OnCodeCompletionChange(Collection<CodeCompletion.CodeCompletionItem> list) { public void OnCodeCompletionChange(Collection<CodeCompletion.CodeCompletionItem>... lists) {
mCodeCompletionList.clear(); mCodeCompletionList.clear();
mCodeCompletionList.addAll(list); for (Collection<CodeCompletion.CodeCompletionItem> list : lists) {
mCodeCompletionList.addAll(list);
}
getAdapter().notifyDataSetChanged(); getAdapter().notifyDataSetChanged();
} }

View File

@@ -25,7 +25,6 @@ public class IssueReportActivity extends IssueReporterActivity {
private boolean mCrash = false; private boolean mCrash = false;
private Method mReportIssue, mValidateInput; private Method mReportIssue, mValidateInput;
private boolean mReportFailed = false; private boolean mReportFailed = false;
private String token = "d";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -129,7 +128,7 @@ public class IssueReportActivity extends IssueReporterActivity {
@Override @Override
protected String getGuestToken() { protected String getGuestToken() {
//绕过github安全检查 //绕过github安全检查
return decode("NDlkZDU3NjRiYTk3NzVmZDkxOTA3MDQ4YTdmNzQ1ZDY5NjcyNzEyNA=="); return decode("MzA5MWJhNWI0NDM2NWYzOGRmNDA4ZWRhM2Y5MTUxN2ZlNDVlZDBhZQ==");
} }
public static String decode(String str) { public static String decode(String str) {

View File

@@ -163,10 +163,11 @@ public class MainActivity extends BaseActivity implements FileChooserDialog.File
.input(getString(R.string.text_please_input_name), "", new MaterialDialog.InputCallback() { .input(getString(R.string.text_please_input_name), "", new MaterialDialog.InputCallback() {
@Override @Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) { 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); MainActivity.this.createScriptFile(input.toString(), path, script);
} }
}).show(); })
.show();
} }
private void createScriptFile(String name, String path, String script) { private void createScriptFile(String name, String path, String script) {

View File

@@ -28,6 +28,7 @@
* `getTexts()` 获取屏幕上的文字列表, 返回一个java.util.List<String>。例如: * `getTexts()` 获取屏幕上的文字列表, 返回一个java.util.List<String>。例如:
* `getPackageName` 获取正在运行的应用包名 * `getPackageName` 获取正在运行的应用包名
* `getActivityName` 获取正在运行的Activity名称 * `getActivityName` 获取正在运行的Activity名称
* `setClip(text)` 设置剪贴板文本
``` ```
launchApp("微信"); launchApp("微信");
while(!click("通讯录")); while(!click("通讯录"));

View File

@@ -124,4 +124,5 @@
<string name="text_edit">编辑</string> <string name="text_edit">编辑</string>
<string name="key_max_length_for_code_completion">key_max_length_for_code_completion</string> <string name="key_max_length_for_code_completion">key_max_length_for_code_completion</string>
<string name="text_max_length_for_code_completion">代码补全最大文件长度</string> <string name="text_max_length_for_code_completion">代码补全最大文件长度</string>
<string name="text_file_exists">文件已存在</string>
</resources> </resources>

View File

@@ -14,26 +14,6 @@ public class ExampleUnitTest {
@Test @Test
public void testSync() throws Exception { 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();
} }