diff --git a/app/src/main/assets/sample/控制台/保存日志.js b/app/src/main/assets/sample/控制台/保存日志.js
new file mode 100644
index 00000000..f93f6cb6
--- /dev/null
+++ b/app/src/main/assets/sample/控制台/保存日志.js
@@ -0,0 +1,7 @@
+console.setGlobalLogConfig({
+ file: "/sdcard/log.txt"
+});
+console.log(1);
+console.log(2);
+console.error(3);
+app.viewFile("/sdcard/log.txt");
diff --git a/app/src/main/assets/sample/控制台/控制台示例.js b/app/src/main/assets/sample/控制台/控制台示例.js
index 6af4d3e4..e70afe40 100644
--- a/app/src/main/assets/sample/控制台/控制台示例.js
+++ b/app/src/main/assets/sample/控制台/控制台示例.js
@@ -6,3 +6,9 @@ console.log("这是黑色");
console.info("这是红色");
console.warn("这是蓝色");
console.error("这是绿色=_=");
+hey();
+
+function hey() {
+ console.trace("打印日志行数");
+}
+
diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
index 7da8054c..a86704bd 100644
--- a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java
@@ -25,7 +25,7 @@ import butterknife.OnTextChanged;
public class FindOrReplaceDialogBuilder extends ThemeColorMaterialDialogBuilder {
- private static final String KEY_KEYWORDS = "你回来好不好...";
+ private static final String KEY_KEYWORDS = "...";
@BindView(R.id.checkbox_regex)
CheckBox mRegexCheckBox;
@@ -50,7 +50,7 @@ public class FindOrReplaceDialogBuilder extends ThemeColorMaterialDialogBuilder
setupViews();
restoreState();
autoDismiss(false);
- onNegative((dialog, which)-> dialog.dismiss());
+ onNegative((dialog, which) -> dialog.dismiss());
onPositive((dialog, which) -> {
storeState();
findOrReplace(dialog);
diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml
index f05c6a9b..dad46b97 100644
--- a/app/src/main/res/layout/activity_build.xml
+++ b/app/src/main/res/layout/activity_build.xml
@@ -12,9 +12,9 @@
+ android:layout_height="wrap_content"
+ android:theme="@style/ToolBarStyle"/>
@@ -65,13 +65,14 @@
+ android:layout_weight="1"
+ android:hint="@string/text_source_file_path">
+ />
@@ -94,13 +95,14 @@
+ android:layout_weight="1"
+ android:hint="@string/text_output_apk_path">
+ />
@@ -142,26 +144,26 @@
+ android:layout_height="wrap_content"
+ android:hint="@string/text_app_name">
+ android:layout_height="wrap_content"/>
+ android:layout_marginTop="12dp"
+ android:hint="@string/text_package_name">
+ android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."/>
+ android:layout_marginTop="12dp"
+ android:hint="@string/text_version_name">
+ android:layout_marginTop="12dp"
+ android:hint="@string/text_version_code">
@@ -211,8 +215,8 @@
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b76b028f..9db866a1 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -18,9 +18,9 @@
@@ -31,16 +31,17 @@
+ android:layout_marginBottom="8dp"
+ android:hint="@string/text_username">
@@ -49,13 +50,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp">
+ android:layout_marginRight="8dp"
+ android:hint="@string/text_password">
diff --git a/app/src/main/res/layout/activity_project_config.xml b/app/src/main/res/layout/activity_project_config.xml
index e90c433b..9e73eab3 100644
--- a/app/src/main/res/layout/activity_project_config.xml
+++ b/app/src/main/res/layout/activity_project_config.xml
@@ -13,8 +13,8 @@
+ android:layout_height="wrap_content"
+ android:theme="@style/ToolBarStyle"/>
@@ -58,26 +58,26 @@
+ android:layout_height="wrap_content"
+ android:hint="@string/text_app_name">
+ android:layout_height="wrap_content"/>
+ android:layout_marginTop="12dp"
+ android:hint="@string/text_package_name">
+ android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."/>
+ android:layout_marginTop="12dp"
+ android:hint="@string/text_version_name">
+ android:layout_marginTop="12dp"
+ android:hint="@string/text_version_code">
@@ -127,8 +129,8 @@
@@ -149,13 +151,13 @@
+ android:layout_height="wrap_content"
+ android:hint="@string/text_project_location">
@@ -188,22 +190,22 @@
+ android:layout_height="wrap_content"
+ android:hint="@string/text_main_file_name">
+ android:text="@string/default_main_file_name"/>
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/text_stable_mode"/>
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 39ced034..e0ef1994 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -31,16 +31,16 @@
+ android:layout_marginBottom="8dp"
+ android:hint="@string/text_email">
@@ -49,15 +49,15 @@
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
+ android:hint="@string/text_username">
@@ -66,13 +66,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp">
+ android:layout_marginRight="8dp"
+ android:hint="@string/text_password">
diff --git a/app/src/main/res/layout/activity_timed_task_setting.xml b/app/src/main/res/layout/activity_timed_task_setting.xml
index 213f9fff..182eea56 100644
--- a/app/src/main/res/layout/activity_timed_task_setting.xml
+++ b/app/src/main/res/layout/activity_timed_task_setting.xml
@@ -14,9 +14,9 @@
@@ -35,8 +35,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
- android:layout_marginRight="6dp"
android:layout_marginTop="12dp"
+ android:layout_marginRight="6dp"
app:cardCornerRadius="2dp"
app:cardElevation="1dp"
app:cardUseCompatPadding="true">
@@ -108,8 +108,8 @@
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:paddingBottom="6dp"
- android:paddingTop="6dp">
+ android:paddingTop="6dp"
+ android:paddingBottom="6dp">
+ android:layout_marginTop="2dp"
+ android:hint="@string/text_broadcast_action">
@@ -420,7 +420,6 @@
-
diff --git a/app/src/main/res/layout/air_card_report_compat.xml b/app/src/main/res/layout/air_card_report_compat.xml
index f7873aa3..80c1d565 100644
--- a/app/src/main/res/layout/air_card_report_compat.xml
+++ b/app/src/main/res/layout/air_card_report_compat.xml
@@ -44,13 +44,13 @@
+ android:layout_marginTop="@dimen/air_baseline"
+ android:hint="@string/air_label_issue_title">
@@ -59,13 +59,13 @@
+ android:layout_marginTop="@dimen/air_baseline_half"
+ android:hint="@string/air_label_issue_description">
diff --git a/app/src/main/res/layout/dialog_script_loop.xml b/app/src/main/res/layout/dialog_script_loop.xml
index adbae78e..24738fa2 100644
--- a/app/src/main/res/layout/dialog_script_loop.xml
+++ b/app/src/main/res/layout/dialog_script_loop.xml
@@ -10,13 +10,13 @@
+ android:layout_height="wrap_content"
+ android:hint="@string/text_loop_times">
@@ -26,21 +26,21 @@
+ android:layout_height="wrap_content"
+ android:hint="@string/text_loop_interval">
@@ -49,13 +49,13 @@
+ android:layout_height="wrap_content"
+ android:hint="@string/text_loop_delay">
@@ -65,8 +65,8 @@
diff --git a/app/src/main/res/layout/shortcut_create_dialog.xml b/app/src/main/res/layout/shortcut_create_dialog.xml
index 5d4eddf6..7101f7c6 100644
--- a/app/src/main/res/layout/shortcut_create_dialog.xml
+++ b/app/src/main/res/layout/shortcut_create_dialog.xml
@@ -23,13 +23,13 @@
+ android:layout_gravity="center_vertical"
+ android:hint="@string/text_name">
+ android:layout_height="wrap_content"/>
diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
index 3ae3d16b..2b47a308 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
@@ -10,7 +10,6 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
-import de.mindpipe.android.logging.log4j.LogConfigurator;
/**
* Created by Stardust on 2017/10/22.