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 5d48b74..51af001 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 @@ -174,7 +174,13 @@ class MainActivity : AppCompatActivity(), OnRobotReadyListener, TtsListener, OnG binding.animatedEmojiView.currentExpression = expression }, setReceptionButtonVisible = { visible -> - binding.btnReception.visibility = if (visible) android.view.View.VISIBLE else android.view.View.GONE + if (visible) { + binding.btnReception.visibility = android.view.View.VISIBLE + binding.animatedEmojiView.visibility = android.view.View.GONE + } else { + binding.btnReception.visibility = android.view.View.GONE + binding.animatedEmojiView.visibility = android.view.View.VISIBLE + } } ) taskController.restoreState( diff --git a/app/src/main/java/com/example/lzwcai_terminal_temi/NavController.kt b/app/src/main/java/com/example/lzwcai_terminal_temi/NavController.kt index 27fb493..32fb431 100644 --- a/app/src/main/java/com/example/lzwcai_terminal_temi/NavController.kt +++ b/app/src/main/java/com/example/lzwcai_terminal_temi/NavController.kt @@ -14,7 +14,18 @@ class NavController(private val robot: Robot) { } fun goTo(location: String, backwards: Boolean = false): Boolean { - robot.goTo(location, backwards) + var targetLocation = location + val knownLocations = getAllLocations() + + // Check if the location is known, ignoring case + val isKnown = knownLocations.any { it.equals(targetLocation, ignoreCase = true) } + + if (!isKnown) { + Log.w(TAG, "Unknown location requested: $targetLocation, redirecting to 会议室") + targetLocation = "会议室" + } + + robot.goTo(targetLocation, backwards) return true } diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index a45d2ab..1810cab 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -66,16 +66,16 @@