From 9b0d44d8da622615608bd2a603843342b91df1cf Mon Sep 17 00:00:00 2001
From: dongliang <dongliang@dongliangdeMac-mini.local>
Date: Thu, 7 May 2026 12:47:16 +0930
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=85=E6=89=93=E5=8D=A1=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E5=9D=97=E7=A7=BB=E5=88=B0=E5=A4=87=E6=B3=A8/?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3/=E5=9B=BE=E7=89=87=E4=B8=8A=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

XML 中 blockGoWhere 和 blockNoScene 从底部移到 tvNote 前面
去掉已不用的 blockHowTo（蓝色指引块）
现在布局顺序：任务名→地点指引→备注→语音→图片

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../xiaoqu/watch/ui/task/TaskListFragment.kt  |   1 -
 .../main/res/layout/fragment_task_list.xml    | 140 +++++++-----------
 2 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
index 0d8f4a7..b664b87 100644
--- a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
+++ b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
@@ -261,7 +261,6 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
         binding.tvNote.visibility = View.GONE
         binding.btnVoice.visibility = View.GONE
         binding.blockGoWhere.visibility = View.GONE
-        binding.blockHowTo.visibility = View.GONE
         binding.blockNoScene.visibility = View.GONE
         binding.blockInProgress.visibility = View.GONE
         binding.blockInspect.visibility = View.GONE
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index 659ea9e..28b1c31 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -123,6 +123,62 @@
                         android:layout_marginBottom="8dp"
                         android:visibility="gone" />
 
+                    <!-- 指引块1：去哪里（橙色，待打卡有场景时显示） -->
+                    <LinearLayout
+                        android:id="@+id/blockGoWhere"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/bg_action_block_orange"
+                        android:orientation="vertical"
+                        android:padding="16dp"
+                        android:layout_marginBottom="8dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:id="@+id/tvGoWhereTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/warning"
+                            android:textSize="28sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="找到打卡点后再点下方按钮"
+                            android:textColor="@color/text_secondary"
+                            android:textSize="24sp"
+                            android:layout_marginTop="5dp" />
+                    </LinearLayout>
+
+                    <!-- 无场景引导块（绿色，待打卡无场景时显示） -->
+                    <LinearLayout
+                        android:id="@+id/blockNoScene"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/bg_action_block_green"
+                        android:orientation="vertical"
+                        android:padding="16dp"
+                        android:layout_marginBottom="8dp"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="无需前往指定地点"
+                            android:textColor="@color/success"
+                            android:textSize="28sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="确认已就位后，直接点击下方按钮"
+                            android:textColor="@color/text_secondary"
+                            android:textSize="24sp"
+                            android:layout_marginTop="5dp" />
+                    </LinearLayout>
+
                     <!-- 备注块（绿色淡背景，20sp） -->
                     <TextView
                         android:id="@+id/tvNote"
@@ -196,90 +252,6 @@
 
                     </HorizontalScrollView>
 
-                    <!-- 指引块1：去哪里（橙色） -->
-                    <LinearLayout
-                        android:id="@+id/blockGoWhere"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/bg_action_block_orange"
-                        android:orientation="vertical"
-                        android:padding="16dp"
-                        android:layout_marginBottom="8dp"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:id="@+id/tvGoWhereTitle"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/warning"
-                            android:textSize="28sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="找到打卡点后再点下方按钮"
-                            android:textColor="@color/text_secondary"
-                            android:textSize="24sp"
-                            android:layout_marginTop="5dp" />
-                    </LinearLayout>
-
-                    <!-- 指引块2：怎么做（蓝色） -->
-                    <LinearLayout
-                        android:id="@+id/blockHowTo"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/bg_action_block_blue"
-                        android:orientation="vertical"
-                        android:padding="16dp"
-                        android:layout_marginBottom="8dp"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="将手表贴近信标"
-                            android:textColor="@color/primary"
-                            android:textSize="28sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="听到提示音即打卡成功"
-                            android:textColor="@color/text_secondary"
-                            android:textSize="24sp"
-                            android:layout_marginTop="5dp" />
-                    </LinearLayout>
-
-                    <!-- 无场景引导块（绿色） -->
-                    <LinearLayout
-                        android:id="@+id/blockNoScene"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/bg_action_block_green"
-                        android:orientation="vertical"
-                        android:padding="16dp"
-                        android:layout_marginBottom="8dp"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="无需前往指定地点"
-                            android:textColor="@color/success"
-                            android:textSize="28sp"
-                            android:textStyle="bold" />
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="确认已就位后，直接点击下方按钮"
-                            android:textColor="@color/text_secondary"
-                            android:textSize="24sp"
-                            android:layout_marginTop="5dp" />
-                    </LinearLayout>
-
                     <!-- 待完成：任务进行中信息 -->
                     <LinearLayout
                         android:id="@+id/blockInProgress"