Merge remote-tracking branch 'origin/master'

tj

2025-03-28 dde2eeddbaf07246da7c2c352e7d49ec63fddcd2

 app/src/main/res/layout/fragment_home.xml

@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

<ScrollView
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_marginTop="40dp"> <!-- 留出顶部广告位的高度 -->
    >

<!--    LinearLayout的作用是按照垂直或者水平方向排列其子视图-->
<!--    CardView组件是用于实现卡片式布局-->
@@ -15,19 +22,7 @@
        android:layout_height="wrap_content"
        android:orientation="vertical">

        <!-- 顶部广告位 -->
        <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:cardCornerRadius="8dp"
            app:cardElevation="2dp">
            
            <ImageView
                android:id="@+id/adBanner"
                android:layout_width="match_parent"
                android:layout_height="80dp"
                android:scaleType="centerCrop"/>
        </androidx.cardview.widget.CardView>


        <!-- 快递/财务切换区域 -->
        <LinearLayout
@@ -74,39 +69,17 @@
            android:layout_height="wrap_content"
            android:layout_margin="16dp">

            <!-- 快递内容 -->
            <androidx.cardview.widget.CardView
                android:id="@+id/expressContent"
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/express_recycler"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                app:cardBackgroundColor="@color/light_blue_50"
                app:cardCornerRadius="8dp"
                app:cardElevation="0dp">
                android:padding="8dp"/>

                <androidx.recyclerview.widget.RecyclerView
                    android:id="@+id/express_recycler"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:padding="8dp"/>

            </androidx.cardview.widget.CardView>

            <!-- 财务内容 -->
            <androidx.cardview.widget.CardView
                android:id="@+id/financeContent"
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/finance_recycler"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                app:cardBackgroundColor="@color/light_blue_50"
                app:cardCornerRadius="8dp"
                app:cardElevation="0dp">

                <androidx.recyclerview.widget.RecyclerView
                    android:id="@+id/finance_recycler"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:padding="8dp"/>

            </androidx.cardview.widget.CardView>
                android:padding="8dp"/>

        </FrameLayout>

@@ -125,4 +98,20 @@
        </androidx.cardview.widget.CardView>

    </LinearLayout>
</ScrollView>
</ScrollView>

    <!-- 顶部广告位 -->
    <androidx.cardview.widget.CardView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
       >

        <ImageView
            android:id="@+id/adBanner"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:scaleType="centerCrop"
            android:src="@drawable/up"/>
    </androidx.cardview.widget.CardView>

</FrameLayout>