From e15d5a2f07e298b9ddf684b09ff8166fdaf9dc1c Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Sun, 11 Nov 2018 18:15:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=A4=9C=E9=97=B4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_log.xml | 6 ++-- .../layout/activity_shortcut_icon_select.xml | 3 +- .../layout/activity_timed_task_setting.xml | 5 ++- app/src/main/res/values-night/colors.xml | 3 ++ app/src/main/res/values-night/styles.xml | 2 -- app/src/main/res/values/colors.xml | 3 ++ app/src/main/res/values/styles.xml | 7 +++-- app/src/main/res/xml/preferences.xml | 26 ++-------------- .../autojs/core/console/ConsoleView.java | 31 +++++++++++++++---- .../core/console/GlobalStardustConsole.java | 10 ------ .../core/ui/inflater/util/Dimensions.java | 2 -- autojs/src/main/res/values/attrs.xml | 11 +++++++ common/release/output.json | 2 +- .../com/stardust/auojs/inrt/LogActivity.java | 14 --------- inrt/src/main/res/layout/activity_main.xml | 4 ++- project-versions.json | 4 +-- 16 files changed, 62 insertions(+), 71 deletions(-) create mode 100644 autojs/src/main/res/values/attrs.xml diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml index 826edc54..db3e993d 100644 --- a/app/src/main/res/layout/activity_log.xml +++ b/app/src/main/res/layout/activity_log.xml @@ -13,10 +13,10 @@ @@ -29,7 +29,9 @@ + android:layout_height="match_parent" + app:color_debug="@color/console_debug" + app:color_verbose="@color/console_verbose"/> + android:layout_height="match_parent"/> \ No newline at end of file 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 ffd51159..213f9fff 100644 --- a/app/src/main/res/layout/activity_timed_task_setting.xml +++ b/app/src/main/res/layout/activity_timed_task_setting.xml @@ -37,7 +37,6 @@ android:layout_marginLeft="6dp" android:layout_marginRight="6dp" android:layout_marginTop="12dp" - app:cardBackgroundColor="@android:color/white" app:cardCornerRadius="2dp" app:cardElevation="1dp" app:cardUseCompatPadding="true"> @@ -125,7 +124,7 @@ android:layout_height="36dp" android:layout_marginLeft="12dp" android:gravity="center_vertical" - android:textColor="#202020" + android:textColor="?android:textColorPrimary" android:textSize="16sp"/> @@ -154,7 +153,7 @@ android:layout_height="36dp" android:layout_marginLeft="12dp" android:gravity="center_vertical" - android:textColor="#202020" + android:textColor="?android:textColorPrimary" android:textSize="16sp"/> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 05e8113c..6181d8b3 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -13,4 +13,7 @@ #3A3A3C #8D8D8E #3A3A3C + #dfc0c0c0 + #7F7F80 + \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index ae0ffb69..5d093628 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -6,7 +6,5 @@ @color/toolbar \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 71842fdc..a9c7e701 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -27,6 +27,9 @@ #a0ffffff @android:color/white #77e0e0e0 + #cc000000 + #dfc0c0c0 + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3fc789b2..c7d18c25 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -63,8 +63,11 @@ - diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 64e91a68..de479f97 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -7,7 +7,6 @@ android:title="@string/text_script_record" android:widgetLayout="@layout/preference_custom"> - - - - - - @@ -124,14 +102,14 @@ /> - android: + android: ATTRS = new MapBuilder() + .put(R.styleable.ConsoleView_color_verbose, Log.VERBOSE) + .put(R.styleable.ConsoleView_color_debug, Log.DEBUG) + .put(R.styleable.ConsoleView_color_info, Log.INFO) + .put(R.styleable.ConsoleView_color_warn, Log.WARN) + .put(R.styleable.ConsoleView_color_error, Log.ERROR) + .put(R.styleable.ConsoleView_color_assert, Log.ASSERT) + .build(); + static final SparseArray COLORS = new SparseArrayEntries() .entry(Log.VERBOSE, 0xdfc0c0c0) .entry(Log.DEBUG, 0xdfffffff) @@ -40,7 +51,7 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe .sparseArray(); private static final int REFRESH_INTERVAL = 100; - private SparseArray mColors = COLORS; + private SparseArray mColors = COLORS.clone(); private StardustConsole mConsole; private RecyclerView mLogListRecyclerView; private EditText mEditText; @@ -51,25 +62,33 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe public ConsoleView(Context context) { super(context); - init(); + init(null); } public ConsoleView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - init(); + init(attrs); } public ConsoleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - init(); + init(attrs); } public void setColors(SparseArray colors) { mColors = colors; } - private void init() { + private void init(AttributeSet attrs) { inflate(getContext(), R.layout.console_view, this); + if (attrs != null) { + TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ConsoleView); + for (Map.Entry attr : ATTRS.entrySet()) { + int styleable = attr.getKey(); + int logLevel = attr.getValue(); + mColors.put(logLevel, typedArray.getColor(styleable, mColors.get(logLevel))); + } + } mLogListRecyclerView = findViewById(R.id.log_list); LinearLayoutManager manager = new LinearLayoutManager(getContext()); mLogListRecyclerView.setLayoutManager(manager); 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 3f49b442..5ae5e7df 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 @@ -15,18 +15,8 @@ import java.util.Locale; public class GlobalStardustConsole extends StardustConsole { private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("HH:mm:ss.SSS", Locale.getDefault()); - private final SparseArray mColors; - public GlobalStardustConsole(UiHandler uiHandler) { super(uiHandler); - mColors = ConsoleView.COLORS.clone(); - mColors.put(android.util.Log.DEBUG, 0xcc000000); - } - - @Override - public void setConsoleView(ConsoleView consoleView) { - super.setConsoleView(consoleView); - consoleView.setColors(mColors); } @Override diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java index 6786adc1..cc0d4117 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java +++ b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/util/Dimensions.java @@ -2,8 +2,6 @@ package com.stardust.autojs.core.ui.inflater.util; import android.content.Context; import android.content.res.TypedArray; -import android.support.v7.widget.CardView; -import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.InflateException; import android.view.View; diff --git a/autojs/src/main/res/values/attrs.xml b/autojs/src/main/res/values/attrs.xml new file mode 100644 index 00000000..4a4610cd --- /dev/null +++ b/autojs/src/main/res/values/attrs.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/common/release/output.json b/common/release/output.json index 2ec12d7a..a7706501 100644 --- a/common/release/output.json +++ b/common/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":437,"versionName":"4.0.4 Alpha8","enabled":true,"outputFile":"commonRelease-4.0.4 Alpha8.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.0.4 Alpha8.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":438,"versionName":"4.0.4 Alpha9","enabled":true,"outputFile":"commonRelease-4.0.4 Alpha9.apk","fullName":"commonRelease","baseName":"common-release"},"path":"commonRelease-4.0.4 Alpha9.apk","properties":{}}] \ No newline at end of file diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java index b303015f..55679ea3 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java +++ b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java @@ -1,11 +1,7 @@ package com.stardust.auojs.inrt; -import android.Manifest; import android.content.Intent; -import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; @@ -13,20 +9,10 @@ import android.view.MenuItem; import android.view.View; import com.stardust.auojs.inrt.autojs.AutoJs; -import com.stardust.auojs.inrt.launch.AssetsProjectLauncher; import com.stardust.auojs.inrt.launch.GlobalProjectLauncher; import com.stardust.autojs.core.console.ConsoleView; import com.stardust.autojs.core.console.StardustConsole; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.microedition.khronos.opengles.GL; - -import static android.content.pm.PackageManager.PERMISSION_DENIED; -import static android.content.pm.PackageManager.PERMISSION_GRANTED; - public class LogActivity extends AppCompatActivity { diff --git a/inrt/src/main/res/layout/activity_main.xml b/inrt/src/main/res/layout/activity_main.xml index b05fcb7e..a5e55c8a 100644 --- a/inrt/src/main/res/layout/activity_main.xml +++ b/inrt/src/main/res/layout/activity_main.xml @@ -24,5 +24,7 @@ + android:layout_height="match_parent" + app:color_debug="#cc000000" + app:color_verbose="#dfc0c0c0"/> \ No newline at end of file diff --git a/project-versions.json b/project-versions.json index 80e0fb64..9b77561e 100644 --- a/project-versions.json +++ b/project-versions.json @@ -1,6 +1,6 @@ { - "appVersionCode": 437, - "appVersionName": "4.0.4 Alpha8", + "appVersionCode": 438, + "appVersionName": "4.0.4 Alpha9", "target": 28, "mini": 17, "compile": 28,