From 92f296cc19222d6f3723ed6b95a8f04e71b92445 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Wed, 29 Nov 2017 20:04:50 +0800
Subject: [PATCH] optimize: util.format
---
app/src/main/AndroidManifest.xml | 8 +--
app/src/main/assets/sample/界面/用户调查.js | 54 +++++++++++++++++++
.../src/main/assets/modules/__automator__.js | 1 +
autojs/src/main/assets/modules/__util__.js | 12 +++--
.../autojs/runtime/ScriptRuntime.java | 2 +
5 files changed, 69 insertions(+), 8 deletions(-)
create mode 100644 app/src/main/assets/sample/界面/用户调查.js
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90b5b38a..d4f7aeb6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:name=".App"
android:allowBackup="false"
- android:icon="@drawable/ic_android_eat_js"
+ android:icon="@drawable/autojs_material"
android:label="@string/_app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
@@ -134,7 +134,7 @@
@@ -151,7 +151,7 @@
@@ -170,7 +170,7 @@
diff --git a/app/src/main/assets/sample/界面/用户调查.js b/app/src/main/assets/sample/界面/用户调查.js
new file mode 100644
index 00000000..8c8e2992
--- /dev/null
+++ b/app/src/main/assets/sample/界面/用户调查.js
@@ -0,0 +1,54 @@
+"ui";
+
+ui.layout(
+
+
+ 关于Auto.js的用户调查
+
+
+
+ 1. 您的年龄是?
+
+ 2. 您用过其他类似软件(脚本精灵，按键精灵等)吗?
+
+
+
+
+
+
+ 3. 您使用Auto.js通常用于做什么?(多选)
+
+
+
+
+
+
+
+
+
+ 4. 您更喜欢以下哪个图标?
+
+
+ 
+
+ 
+
+ 5. 您是什么时候开始使用Auto.js的呢?
+
+ 6. 您用过下面这个Auto.js的论坛吗?
+
+
+
+
+
+
+
+
+
+
+
+
+
+)
+
+ui.webview.getWebView().loadUrl("http://www.autojs.org");
\ No newline at end of file
diff --git a/autojs/src/main/assets/modules/__automator__.js b/autojs/src/main/assets/modules/__automator__.js
index 6d425c68..c5e84f90 100644
--- a/autojs/src/main/assets/modules/__automator__.js
+++ b/autojs/src/main/assets/modules/__automator__.js
@@ -118,6 +118,7 @@ module.exports = function(__runtime__, scope){
}
mode = mode || 0;
__runtime__.accessibilityBridge.setMode(mode);
+ __runtime__.accessibilityBridge.ensureServiceEnabled();
}
scope.__asGlobal__(__runtime__.automator, ['back', 'home', 'powerDialog', 'notifications', 'quickSettings', 'recents', 'splitScreen']);
diff --git a/autojs/src/main/assets/modules/__util__.js b/autojs/src/main/assets/modules/__util__.js
index 49e37c47..1d24408e 100644
--- a/autojs/src/main/assets/modules/__util__.js
+++ b/autojs/src/main/assets/modules/__util__.js
@@ -24,7 +24,7 @@ exports.format = function(f) {
if (!isString(f)) {
var objects = [];
for (var i = 0; i < arguments.length; i++) {
- var v = (arguments[i] && isJavaObject(arguments[i])) ? arguments[i].toString() :
+ var v = //(arguments[i] && isJavaObject(arguments[i])) ? arguments[i].toString() :
arguments[i];
objects.push(inspect(v));
}
@@ -312,9 +312,13 @@ function formatValue(ctx, value, recurseTimes) {
if (array) {
output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
} else {
- output = keys.map(function(key) {
- return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
- });
+ try{
+ output = keys.map(function(key) {
+ return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+ });
+ }catch(err){
+ return value.toString();
+ }
}
ctx.seen.pop();
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
index d93cd5bf..f1e78ec9 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
@@ -38,6 +38,8 @@ import com.stardust.util.UiHandler;
import com.stardust.view.accessibility.AccessibilityInfoProvider;
import org.mozilla.javascript.ContextFactory;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
import java.io.File;
import java.io.IOException;