From a41c8879e6c21ad6dfd9f5298b5abeaa43dae46e Mon Sep 17 00:00:00 2001
From: dongliang <dongliang@dongliangdeMac-mini.local>
Date: Thu, 7 May 2026 16:25:18 +0930
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=87=E6=B3=A8=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=92=8C=E5=86=85=E5=AE=B9=E5=90=88=E4=B8=BA=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=20TextView?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"备注: xxx" 拼在一起，去掉多余的标签 TextView 和 LinearLayout 容器
样式不变（深灰背景、22sp、白色文字、13dp padding）

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../xiaoqu/watch/ui/task/TaskListFragment.kt  |  6 ++--
 .../main/res/layout/fragment_task_list.xml    | 31 ++++---------------
 2 files changed, 9 insertions(+), 28 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 6586701..f4638d1 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
@@ -258,7 +258,7 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
         binding.tvPoints.visibility = View.GONE
         binding.picScrollView.visibility = View.GONE
         binding.picContainer.removeAllViews()
-        binding.noteContainer.visibility = View.GONE
+        binding.tvNote.visibility = View.GONE
         binding.btnVoice.visibility = View.GONE
         binding.blockGoWhere.visibility = View.GONE
         binding.blockNoScene.visibility = View.GONE
@@ -377,8 +377,8 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
             else -> null
         }
         if (note != null) {
-            binding.tvNote.text = note
-            binding.noteContainer.visibility = View.VISIBLE
+            binding.tvNote.text = "备注: $note"
+            binding.tvNote.visibility = View.VISIBLE
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index 3ddc02a..867b7bf 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -179,36 +179,17 @@
                             android:layout_marginTop="5dp" />
                     </LinearLayout>
 
-                    <!-- 备注块：标签和内容同行 -->
-                    <LinearLayout
-                        android:id="@+id/noteContainer"
+                    <!-- 备注（备注:标签拼在内容文字前面） -->
+                    <TextView
+                        android:id="@+id/tvNote"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
                         android:background="@drawable/bg_note"
                         android:padding="13dp"
                         android:layout_marginBottom="11dp"
-                        android:gravity="center_vertical"
-                        android:visibility="gone">
-
-                        <!-- 备注标签 -->
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="备注: "
-                            android:textColor="@color/text_secondary"
-                            android:textSize="22sp" />
-
-                        <!-- 备注内容 -->
-                        <TextView
-                            android:id="@+id/tvNote"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textColor="@color/text_primary"
-                            android:textSize="22sp" />
-
-                    </LinearLayout>
+                        android:textColor="@color/text_primary"
+                        android:textSize="22sp"
+                        android:visibility="gone" />
 
                     <!-- 语音播放按钮（用户上报任务附带语音描述） -->
                     <LinearLayout