tanjianbin/lzwcai-terminal-temi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修正自动充电任务检查逻辑

Browse Source 
将自动充电的条件从检查任务是否为空改为检查任务是否允许充电
新增 `isAutoRechargeAllowedTask()` 方法，允许 "speech" 任务时也能触发自动充电
This commit is contained in:
tanjianbin
2026-04-24 18:19:39 +08:00
parent c1e9ee8d34
commit b5b5d0ad5b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/example/lzwcai_terminal_temi/MainActivity.kt
View File

@@ -749,7 +749,7 @@ class MainActivity : AppCompatActivity(), OnRobotReadyListener, TtsListener, OnG
} }
private fun scheduleAutoRechargeAfterIdleArrival() { private fun scheduleAutoRechargeAfterIdleArrival() {
if (taskController.currentTask.isNotEmpty()) { if (!isAutoRechargeAllowedTask()) {
return return
} }
if (robotEventHandler.normalizeLocation(lastArrivalLocation) == "homebase") { if (robotEventHandler.normalizeLocation(lastArrivalLocation) == "homebase") {
@@ -758,7 +758,7 @@ class MainActivity : AppCompatActivity(), OnRobotReadyListener, TtsListener, OnG
autoRechargeJob?.cancel() autoRechargeJob?.cancel()
autoRechargeJob = mainScope.launch { autoRechargeJob = mainScope.launch {
delay(10_000L) delay(10_000L)
if (taskController.currentTask.isNotEmpty()) { if (!isAutoRechargeAllowedTask()) {
return@launch return@launch
} }
if (robotEventHandler.normalizeLocation(lastArrivalLocation) == "homebase") { 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) { private fun cancelAutoRecharge(reason: String) {
if (autoRechargeJob?.isActive == true) { if (autoRechargeJob?.isActive == true) {
Log.i("MainActivity", "Auto recharge canceled: $reason") Log.i("MainActivity", "Auto recharge canceled: $reason")