From b5b5d0ad5b4d14f7e5ae7c82c452281cf78e4477 Mon Sep 17 00:00:00 2001 From: tanjianbin <632190820@qq.com> Date: Fri, 24 Apr 2026 18:19:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=85=85=E7=94=B5=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将自动充电的条件从检查任务是否为空改为检查任务是否允许充电 新增 `isAutoRechargeAllowedTask()` 方法，允许 "speech" 任务时也能触发自动充电 --- .../com/example/lzwcai_terminal_temi/MainActivity.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/lzwcai_terminal_temi/MainActivity.kt b/app/src/main/java/com/example/lzwcai_terminal_temi/MainActivity.kt index 57a803c..983b3ce 100644 --- a/app/src/main/java/com/example/lzwcai_terminal_temi/MainActivity.kt +++ b/app/src/main/java/com/example/lzwcai_terminal_temi/MainActivity.kt @@ -749,7 +749,7 @@ class MainActivity : AppCompatActivity(), OnRobotReadyListener, TtsListener, OnG } private fun scheduleAutoRechargeAfterIdleArrival() { - if (taskController.currentTask.isNotEmpty()) { + if (!isAutoRechargeAllowedTask()) { return } if (robotEventHandler.normalizeLocation(lastArrivalLocation) == "homebase") { @@ -758,7 +758,7 @@ class MainActivity : AppCompatActivity(), OnRobotReadyListener, TtsListener, OnG autoRechargeJob?.cancel() autoRechargeJob = mainScope.launch { delay(10_000L) - if (taskController.currentTask.isNotEmpty()) { + if (!isAutoRechargeAllowedTask()) { return@launch } if (robotEventHandler.normalizeLocation(lastArrivalLocation) == "homebase") { @@ -769,6 +769,11 @@ class MainActivity : AppCompatActivity(), OnRobotReadyListener, TtsListener, OnG } } + private fun isAutoRechargeAllowedTask(): Boolean { + val task = taskController.currentTask.trim().lowercase() + return task.isEmpty() || task == "speech" + } + private fun cancelAutoRecharge(reason: String) { if (autoRechargeJob?.isActive == true) { Log.i("MainActivity", "Auto recharge canceled: $reason")