From 25e9c90bf481f218c8f3dc193242f42c64d897b7 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Mon, 11 Dec 2017 19:10:01 +0800 Subject: [PATCH] api: app --- app/build.gradle | 4 +-- app/src/main/assets/indices/all.json | 2 +- autojs/src/main/assets/modules/__app__.js | 32 +++++++++++++++++++ .../stardust/autojs/runtime/api/AppUtils.java | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 09a772d1..320bd957 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 17 targetSdkVersion 23 - versionCode 234 - versionName "3.0.0 Alpha34" + versionCode 236 + versionName "3.0.0 Alpha36" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true ndk { diff --git a/app/src/main/assets/indices/all.json b/app/src/main/assets/indices/all.json index be065fe3..63ae2e91 100644 --- a/app/src/main/assets/indices/all.json +++ b/app/src/main/assets/indices/all.json @@ -144,7 +144,7 @@ }, { "key": "hide", - "url": "", + "url": "console.html#console_console_hide", "summary": "隐藏" }, { diff --git a/autojs/src/main/assets/modules/__app__.js b/autojs/src/main/assets/modules/__app__.js index ef0091d8..72f0aa43 100644 --- a/autojs/src/main/assets/modules/__app__.js +++ b/autojs/src/main/assets/modules/__app__.js @@ -1,5 +1,6 @@ module.exports = function(__runtime__, scope){ + importClass(android.content.Intent); var app = Object.create(__runtime__.app); var context = scope.context; @@ -38,6 +39,37 @@ module.exports = function(__runtime__, scope){ context.sendBroadcast(app.intent(i)); } + app.sendEmail = function(options){ + options = options || {}; + var i = new Intent(ACTION_SENDTO); + if(options.email){ + i.putExtra(Intent.EXTRA_EMAIL, toArray(options.email)); + } + if(options.cc){ + i.putExtra(Intent.EXTRA_CC, toArray(options.cc)); + } + if(options.bcc){ + i.putExtra(Intent.EXTRA_BCC, toArray(options.bcc)); + } + if(options.subject){ + i.putExtra(Intent.EXTRA_SUBJECT, options.subject); + } + if(options.text){ + i.putExtra(Intent.EXTRA_TEXT, options.text); + } + if(options.attachment){ + i.putExtra(Intent.EXTRA_STREAM, android.content.Uri.parse("file://" + options.attachment)); + } + context.startActivity(Intent.createChooser(i, "发送邮件").addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); + } + + function toArray(arg){ + if(typeof(arg) == 'string'){ + return [arg]; + } + return arg; + } + app.launch = app.launchPackage; scope.__asGlobal__(app, ['launchPackage', 'launch', 'launchApp', 'getPackageName', 'getAppName', 'openAppSetting']); diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java index d7183850..35b0c5ea 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java @@ -48,7 +48,7 @@ public class AppUtils { @ScriptInterface public boolean launchApp(String appName) { String pkg = getPackageName(appName); - if(pkg == null) + if (pkg == null) return false; return launchPackage(pkg); }