shumeng/xqwatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 待打卡地点块移到备注/语音/图片上方

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

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
dongliang
2026-05-07 12:47:16 +09:30
parent 39d7fc8b66
commit 9b0d44d8da
2 changed files with 56 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
View File

@@ -261,7 +261,6 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
binding.tvNote.visibility = View.GONE binding.tvNote.visibility = View.GONE
binding.btnVoice.visibility = View.GONE binding.btnVoice.visibility = View.GONE
binding.blockGoWhere.visibility = View.GONE binding.blockGoWhere.visibility = View.GONE
binding.blockHowTo.visibility = View.GONE
binding.blockNoScene.visibility = View.GONE binding.blockNoScene.visibility = View.GONE
binding.blockInProgress.visibility = View.GONE binding.blockInProgress.visibility = View.GONE
binding.blockInspect.visibility = View.GONE binding.blockInspect.visibility = View.GONE

140
app/src/main/res/layout/fragment_task_list.xml
View File

@@ -123,6 +123,62 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:visibility="gone" /> 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） --> <!-- 备注块（绿色淡背景，20sp） -->
<TextView <TextView
android:id="@+id/tvNote" android:id="@+id/tvNote"
@@ -196,90 +252,6 @@
</HorizontalScrollView> </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 <LinearLayout
android:id="@+id/blockInProgress" android:id="@+id/blockInProgress"