From 8698dfacf2b1205db588d604139e917e0a5cf28d Mon Sep 17 00:00:00 2001
From: tanjianbin <632190820@qq.com>
Date: Mon, 20 Apr 2026 17:22:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E6=9C=AA=E7=9F=A5?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=9B=AE=E6=A0=87=E5=B9=B6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=BE=85=E6=8C=89=E9=92=AE=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 NavController.goTo 中添加未知位置检查，若位置不存在则重定向到默认会议室
- 调整接待按钮的显示逻辑，当按钮可见时隐藏动画表情视图
- 修改接待按钮的布局约束和文本样式，使其在横竖屏下均占满宽度并增大字体
---
 .../lzwcai_terminal_temi/MainActivity.kt       |  8 +++++++-
 .../lzwcai_terminal_temi/NavController.kt      | 13 ++++++++++++-
 app/src/main/res/layout-land/activity_main.xml | 16 ++++++++--------
 app/src/main/res/layout/activity_main.xml      | 18 +++++++++---------
 4 files changed, 36 insertions(+), 19 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 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 @@
     <Button
         android:id="@+id/btnReception"
         style="@style/Widget.App.Button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginTop="40dp"
         android:layout_marginBottom="40dp"
-        android:paddingStart="48dp"
-        android:paddingTop="16dp"
-        android:paddingEnd="48dp"
-        android:paddingBottom="16dp"
-        android:text="是的"
-        android:textSize="20sp"
+        android:text="是的，请带我去"
+        android:textSize="48sp"
         android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 949f1f5..76810fc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -66,16 +66,16 @@
     <Button
         android:id="@+id/btnReception"
         style="@style/Widget.App.Button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="80dp"
-        android:paddingStart="48dp"
-        android:paddingTop="16dp"
-        android:paddingEnd="48dp"
-        android:paddingBottom="16dp"
-        android:text="是的"
-        android:textSize="20sp"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="40dp"
+        android:text="是的，请带我去"
+        android:textSize="48sp"
         android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />