From 102c058226554ed19090dd535a093cf52877c0e7 Mon Sep 17 00:00:00 2001
From: SuperMonster003 <wu2du2mo2gu0@gmail.com>
Date: Thu, 17 Apr 2025 18:42:31 +0800
Subject: [PATCH] =?UTF-8?q?6.6.3=20-=20Alpha=20-=20=E4=BF=AE=E5=A4=8D=20co?=
 =?UTF-8?q?nsole.setContentTextColor=20=E6=97=A5=E5=BF=97=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=E5=BC=82=E5=B8=B8=20(issue=20#346)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changelog/lang_zh-Hans.json                               | 3 ++-
 .../java/org/autojs/autojs/core/console/ConsoleImpl.kt     | 6 +++---
 .../autojs/autojs/runtime/api/augment/console/Console.kt   | 7 +++++--
 version.properties                                         | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json
index d712365e..6726abaf 100644
--- a/.changelog/lang_zh-Hans.json
+++ b/.changelog/lang_zh-Hans.json
@@ -4,7 +4,8 @@
       "released_date": "2025/04/17",
       "fix": [
         "主页文档标签显示在线文档时部分内容被系统导航栏遮挡的问题",
-        "部分设备代码编辑器空行显示方框字符的问题"
+        "部分设备代码编辑器空行显示方框字符的问题",
+        "console.setContentTextColor 方法导致日志字体颜色丢失默认值的问题 _[`issue #346`](http://issues.autojs6.com/346)_"
       ]
     },
     "v6.6.2": {
diff --git a/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt b/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt
index 1918a480..1eb202ad 100644
--- a/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt
+++ b/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt
@@ -632,7 +632,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
     fun getContentTextSize() = getFloatingConsoleView()?.textSize ?: 0f
 
     @ScriptInterface
-    fun setContentTextColors(colors: Array<out Int>) = runWithWindow({ configurator.setContentTextColors(colors) }) {
+    fun setContentTextColors(colors: Array<out Int?>) = runWithWindow({ configurator.setContentTextColors(colors) }) {
         getFloatingConsoleView()?.setTextColors(colors)
     }
 
@@ -859,7 +859,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
             private set
 
         @Volatile
-        var contentTextColors: Array<out Int>? = null
+        var contentTextColors: Array<out Int?>? = null
             private set
 
         @Volatile
@@ -923,7 +923,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() {
             contentTextSize = size
         }
 
-        fun setContentTextColors(colors: Array<out Int>) = also {
+        fun setContentTextColors(colors: Array<out Int?>) = also {
             contentTextColors = colors
         }
 
diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt b/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt
index e2a5b479..0107420a 100644
--- a/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt
+++ b/app/src/main/java/org/autojs/autojs/runtime/api/augment/console/Console.kt
@@ -410,10 +410,13 @@ class Console(scriptRuntime: ScriptRuntime) : AugmentableProxy(scriptRuntime) {
             when (argList.size) {
                 1 -> when (val o = argList[0]) {
                     is NativeArray -> {
-                        scriptRuntime.console.setContentTextColors(o.map { S13n.color(arrayOf(it)) }.toTypedArray())
+                        val tmp = Array(6) { index ->
+                            if (index < o.size) S13n.color(arrayOf(o[index])) else null
+                        }
+                        scriptRuntime.console.setContentTextColors(tmp)
                     }
                     is NativeObject -> {
-                        val tmp = Array(6) { 0 }
+                        val tmp = Array<Int?>(6) { null }
                         listOf("verbose", "log", "info", "warn", "error", "assert").forEachIndexed { index, key ->
                             if (o.hasProp(key)) {
                                 tmp[index] = S13n.color(arrayOf(o.prop(key)))
diff --git a/version.properties b/version.properties
index a107d1be..a6750aa1 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
-#Thu Apr 17 18:03:05 CST 2025
-BUILD_TIME=1744884185114
+#Thu Apr 17 18:34:12 CST 2025
+BUILD_TIME=1744886052185
 COMPILE_SDK_VERSION=35
 JAVA_VERSION=23
 JAVA_VERSION_MIN_RADICAL=0