From 3835c9d4a92e9678fa660bff288afcfb7e97f189 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Tue, 20 Nov 2018 23:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=9C=A8=E9=AD=85?=
 =?UTF-8?q?=E6=97=8F=E8=AE=BE=E5=A4=87=E6=97=B6=E9=83=A8=E5=88=86=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/sample/控制台/保存日志.js |  7 +++
 .../main/assets/sample/控制台/控制台示例.js   |  6 +++
 .../ui/edit/FindOrReplaceDialogBuilder.java   |  4 +-
 app/src/main/res/layout/activity_build.xml    | 38 +++++++++-------
 app/src/main/res/layout/activity_login.xml    | 13 +++---
 .../res/layout/activity_project_config.xml    | 44 ++++++++++---------
 app/src/main/res/layout/activity_register.xml | 16 +++----
 .../layout/activity_timed_task_setting.xml    | 15 +++----
 .../res/layout/air_card_report_compat.xml     |  8 ++--
 .../main/res/layout/dialog_script_loop.xml    | 16 +++----
 .../res/layout/shortcut_create_dialog.xml     |  6 +--
 .../core/console/GlobalStardustConsole.java   |  1 -
 12 files changed, 96 insertions(+), 78 deletions(-)
 create mode 100644 app/src/main/assets/sample/控制台/保存日志.js

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 @@
 
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
-            android:theme="@style/ToolBarStyle"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:theme="@style/ToolBarStyle"/>
 
     </android.support.design.widget.AppBarLayout>
 
@@ -65,13 +65,14 @@
                             <android.support.design.widget.TextInputLayout
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1">
+                                android:layout_weight="1"
+                                android:hint="@string/text_source_file_path">
 
                                 <android.support.design.widget.TextInputEditText
                                     android:id="@+id/source_path"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:hint="@string/text_source_file_path"/>
+                                    />
 
                             </android.support.design.widget.TextInputLayout>
 
@@ -94,13 +95,14 @@
                             <android.support.design.widget.TextInputLayout
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1">
+                                android:layout_weight="1"
+                                android:hint="@string/text_output_apk_path">
 
                                 <android.support.design.widget.TextInputEditText
                                     android:id="@+id/output_path"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:hint="@string/text_output_apk_path"/>
+                                    />
 
                             </android.support.design.widget.TextInputLayout>
 
@@ -142,26 +144,26 @@
 
                         <android.support.design.widget.TextInputLayout
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:hint="@string/text_app_name">
 
                             <android.support.design.widget.TextInputEditText
                                 android:id="@+id/app_name"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/text_app_name"/>
+                                android:layout_height="wrap_content"/>
                         </android.support.design.widget.TextInputLayout>
 
                         <android.support.design.widget.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp">
+                            android:layout_marginTop="12dp"
+                            android:hint="@string/text_package_name">
 
                             <android.support.design.widget.TextInputEditText
                                 android:id="@+id/package_name"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."
-                                android:hint="@string/text_package_name"/>
+                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."/>
                         </android.support.design.widget.TextInputLayout>
 
                         <LinearLayout
@@ -178,26 +180,28 @@
                                 <android.support.design.widget.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_name">
 
                                     <android.support.design.widget.TextInputEditText
                                         android:id="@+id/version_name"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_name"
+
                                         android:text="1.0.0"/>
                                 </android.support.design.widget.TextInputLayout>
 
                                 <android.support.design.widget.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_code">
 
                                     <android.support.design.widget.TextInputEditText
                                         android:id="@+id/version_code"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_code"
+
                                         android:inputType="number"
                                         android:text="1"/>
                                 </android.support.design.widget.TextInputLayout>
@@ -211,8 +215,8 @@
                                 <TextView
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginBottom="12dp"
                                     android:layout_marginTop="12dp"
+                                    android:layout_marginBottom="12dp"
                                     android:text="@string/text_icon"
                                     android:textColor="#9e9e9e"
                                     android:textSize="12sp"/>
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 @@
 
             <com.stardust.theme.widget.ThemeColorToolbar
                 android:id="@+id/toolbar"
-                android:theme="@style/ToolBarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:theme="@style/ToolBarStyle"
                 android:title="@string/text_login"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
@@ -31,16 +31,17 @@
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
             android:layout_marginLeft="8dp"
+            android:layout_marginTop="12dp"
             android:layout_marginRight="8dp"
-            android:layout_marginTop="12dp">
+            android:layout_marginBottom="8dp"
+            android:hint="@string/text_username">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_username"
+
                 android:textColor="?android:textColorPrimary"/>
 
         </android.support.design.widget.TextInputLayout>
@@ -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">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_password"
                 android:inputType="textPassword"
                 android:textColor="?android:textColorPrimary"/>
 
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 @@
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:theme="@style/ToolBarStyle"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:theme="@style/ToolBarStyle"/>
 
     </android.support.design.widget.AppBarLayout>
 
@@ -58,26 +58,26 @@
 
                         <android.support.design.widget.TextInputLayout
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:hint="@string/text_app_name">
 
                             <android.support.design.widget.TextInputEditText
                                 android:id="@+id/app_name"
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/text_app_name"/>
+                                android:layout_height="wrap_content"/>
                         </android.support.design.widget.TextInputLayout>
 
                         <android.support.design.widget.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="12dp">
+                            android:layout_marginTop="12dp"
+                            android:hint="@string/text_package_name">
 
                             <android.support.design.widget.TextInputEditText
                                 android:id="@+id/package_name"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."
-                                android:hint="@string/text_package_name"/>
+                                android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_."/>
                         </android.support.design.widget.TextInputLayout>
 
                         <LinearLayout
@@ -94,26 +94,28 @@
                                 <android.support.design.widget.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_name">
 
                                     <android.support.design.widget.TextInputEditText
                                         android:id="@+id/version_name"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_name"
+
                                         android:text="1.0.0"/>
                                 </android.support.design.widget.TextInputLayout>
 
                                 <android.support.design.widget.TextInputLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="12dp">
+                                    android:layout_marginTop="12dp"
+                                    android:hint="@string/text_version_code">
 
                                     <android.support.design.widget.TextInputEditText
                                         android:id="@+id/version_code"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_version_code"
+
                                         android:inputType="number"
                                         android:text="1"/>
                                 </android.support.design.widget.TextInputLayout>
@@ -127,8 +129,8 @@
                                 <TextView
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginBottom="12dp"
                                     android:layout_marginTop="12dp"
+                                    android:layout_marginBottom="12dp"
                                     android:text="@string/text_icon"
                                     android:textColor="#9e9e9e"
                                     android:textSize="12sp"/>
@@ -149,13 +151,13 @@
 
                         <android.support.design.widget.TextInputLayout
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:hint="@string/text_project_location">
 
                             <android.support.design.widget.TextInputEditText
                                 android:id="@+id/project_location"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:hint="@string/text_project_location"
                                 android:inputType="number"/>
                         </android.support.design.widget.TextInputLayout>
 
@@ -188,22 +190,22 @@
 
                         <android.support.design.widget.TextInputLayout
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
+                            android:layout_height="wrap_content"
+                            android:hint="@string/text_main_file_name">
 
                             <android.support.design.widget.TextInputEditText
                                 android:id="@+id/main_file_name"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="@string/default_main_file_name"
-                                android:hint="@string/text_main_file_name"/>
+                                android:text="@string/default_main_file_name"/>
 
                         </android.support.design.widget.TextInputLayout>
 
                         <org.autojs.autojs.ui.widget.CheckBoxCompat
-                            android:layout_width="wrap_content"
                             android:id="@+id/default_stable_mode"
-                            android:text="@string/text_stable_mode"
-                            android:layout_height="wrap_content"/>
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/text_stable_mode"/>
 
                     </LinearLayout>
 
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.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
             android:layout_marginLeft="8dp"
+            android:layout_marginTop="12dp"
             android:layout_marginRight="8dp"
-            android:layout_marginTop="12dp">
+            android:layout_marginBottom="8dp"
+            android:hint="@string/text_email">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_email"
                 android:inputType="textEmailAddress"
                 android:textColor="?android:textColorPrimary"/>
 
@@ -49,15 +49,15 @@
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
             android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp">
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:hint="@string/text_username">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_username"
                 android:textColor="?android:textColorPrimary"/>
 
         </android.support.design.widget.TextInputLayout>
@@ -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">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/text_password"
                 android:inputType="textPassword"
                 android:textColor="?android:textColorPrimary"/>
 
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 @@
         <com.stardust.theme.widget.ThemeColorToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:theme="@style/ToolBarStyle"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
+            android:theme="@style/ToolBarStyle"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
     </android.support.design.widget.AppBarLayout>
@@ -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">
 
                                 <org.autojs.autojs.theme.widget.ThemeColorImageViewCompat
                                     android:layout_width="24dp"
@@ -132,8 +132,8 @@
                                 android:id="@+id/disposable_task_date_container"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_alignParentBottom="true"
                                 android:layout_below="@+id/disposable_task_time_container"
+                                android:layout_alignParentBottom="true"
                                 android:background="?selectableItemBackground"
                                 android:gravity="center_vertical"
                                 android:orientation="horizontal"
@@ -405,14 +405,14 @@
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:layout_marginLeft="36dp"
-                                    android:layout_marginTop="2dp">
+                                    android:layout_marginTop="2dp"
+                                    android:hint="@string/text_broadcast_action">
 
 
                                     <android.support.design.widget.TextInputEditText
                                         android:id="@+id/action"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:hint="@string/text_broadcast_action"
                                         android:maxLines="2"
                                         android:text="@string/text_broadcast_action_prefix"/>
 
@@ -420,7 +420,6 @@
 
                             </LinearLayout>
 
-
                         </com.github.aakira.expandablelayout.ExpandableRelativeLayout>
                     </RadioGroup>
                 </LinearLayout>
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.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/air_baseline">
+            android:layout_marginTop="@dimen/air_baseline"
+            android:hint="@string/air_label_issue_title">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/air_inputTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/air_label_issue_title"
                 android:inputType="textCapSentences"
                 android:maxLines="1"/>
 
@@ -59,13 +59,13 @@
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/air_baseline_half">
+            android:layout_marginTop="@dimen/air_baseline_half"
+            android:hint="@string/air_label_issue_description">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/air_inputDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/air_label_issue_description"
                 android:inputType="textMultiLine|textCapSentences"
                 android:lines="2"
                 android:scrollbars="vertical"/>
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.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_loop_times">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/loop_times"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/text_loop_times"
             android:inputType="number"
             android:text="0"
             tools:ignore="HardcodedText"/>
@@ -26,21 +26,21 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
         android:layout_marginLeft="4dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/hint_loop_times"
         android:textColor="#77000000"
         android:textSize="12sp"/>
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_loop_interval">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/loop_interval"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/text_loop_interval"
             android:inputType="numberDecimal"
             android:text="1.0"
             tools:ignore="HardcodedText"/>
@@ -49,13 +49,13 @@
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:hint="@string/text_loop_delay">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/loop_delay"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/text_loop_delay"
             android:inputType="numberDecimal"
             android:text="0.0"
             tools:ignore="HardcodedText"/>
@@ -65,8 +65,8 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
         android:layout_marginLeft="4dp"
+        android:layout_marginBottom="8dp"
         android:text="@string/hint_loop_delay"
         android:textColor="#77000000"
         android:textSize="12sp"/>
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.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
+            android:layout_gravity="center_vertical"
+            android:hint="@string/text_name">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/name"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/text_name"/>
+                android:layout_height="wrap_content"/>
 
         </android.support.design.widget.TextInputLayout>
     </LinearLayout>
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.