From 66a4a5c3aa78869a3c51e79f2a6a610c99016c24 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 16 四月 2025 08:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/res/layout/fragment_dashboard.xml | 143 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 126 insertions(+), 17 deletions(-)
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index ad51843..243ba37 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -68,6 +68,22 @@
</LinearLayout>
<!-- 包裹统计卡片 -->
+ <LinearLayout
+ android:id="@+id/card_package_stats_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/layout_date_picker"
+ >
+ <TextView
+ android:id="@+id/card_package_stats_title_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="本日收到包裹总数 ->"
+ android:layout_marginLeft="16dp"
+ >
+
+ </TextView>
+ </LinearLayout>
<androidx.cardview.widget.CardView
android:id="@+id/card_package_stats"
android:layout_width="match_parent"
@@ -75,7 +91,7 @@
android:layout_margin="16dp"
app:cardCornerRadius="8dp"
app:cardElevation="4dp"
- app:layout_constraintTop_toBottomOf="@id/layout_date_picker">
+ app:layout_constraintTop_toBottomOf="@id/card_package_stats_title">
<LinearLayout
android:layout_width="match_parent"
@@ -119,6 +135,7 @@
</LinearLayout>
</androidx.cardview.widget.CardView>
+
<!-- 年度统计布局 -->
<include
android:id="@+id/layout_year_stats"
@@ -136,27 +153,119 @@
app:layout_constraintTop_toBottomOf="@id/layout_year_stats"
app:layout_constraintBottom_toBottomOf="parent">
- <ViewFlipper
- android:id="@+id/view_flipper_stats"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <!-- 日视图 -->
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recycler_packages"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clipToPadding="false"
- android:paddingBottom="16dp" />
+ android:layout_height="wrap_content">
+ <ViewFlipper
+ android:id="@+id/view_flipper_stats"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <!-- 周视图 -->
- <include
- android:id="@+id/layout_week_stats"
- layout="@layout/layout_week_stats"
+ <!-- 日视图 -->
+ <LinearLayout
+ android:id="@+id/recycler_packages_11"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <LinearLayout
+ android:id="@+id/layout_year_stats_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/card_package_stats"
+ >
+ <TextView
+ android:id="@+id/layout_year_stats_title_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="包裹取件码记录 ->"
+ android:layout_margin="16dp"
+ >
+
+ </TextView>
+ </LinearLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recycler_packages"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clipToPadding="false"
+ android:paddingBottom="16dp" />
+
+ </LinearLayout>
+
+
+
+ <!-- 周视图 -->
+ <include
+ android:id="@+id/layout_week_stats"
+ layout="@layout/layout_week_stats"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ </ViewFlipper>
+ </LinearLayout>
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="80dp" />
- </ViewFlipper>
+</LinearLayout>
+
</androidx.core.widget.NestedScrollView>
+ <!-- 🔹 遮罩层 -->
+ <View
+ android:id="@+id/view_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@mipmap/overlay2"
+ android:elevation="10dp"
+ android:visibility="gone"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent" />
+
+ <!-- 🔹 遮罩层上的按钮 -->
+ <!-- 🔹 遮罩层上的内容容器（LinearLayout） -->
+ <LinearLayout
+ android:id="@+id/overlay_content"
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:padding="10dp"
+ android:background="@drawable/overlay_black_background"
+ android:elevation="20dp"
+ android:translationZ="20dp"
+ android:visibility="gone"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent">
+
+
+ <ImageView
+ android:id="@+id/overlay_content_vip_image"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:scaleType="centerCrop"
+ android:src="@mipmap/vip_crown"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <!-- 🔹 示例内容：标题 -->
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="免费查看统计数据"
+ android:textSize="18sp"
+ android:textColor="#EEBC93" />
+
+ </LinearLayout>
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.9.3