Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

zhujie

2025-04-03 fe04012057d024770e0180543483d393281a542f

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

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
    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">
@@ -23,45 +22,85 @@
        android:orientation="vertical">



        <!-- 快递/财务切换区域 -->
            <FrameLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="8dp"
                android:layout_marginTop="8dp"
                android:layout_marginHorizontal="8dp">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
            android:layout_marginBottom="8dp">
                    android:layout_marginEnd="30dp"
                    android:orientation="horizontal">

            <TextView
                    <com.example.firstapp.view.UnderlineTextView
                android:id="@+id/tabExpress"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="快递"
                android:gravity="center"
                android:padding="8dp"
                android:textSize="16sp"
                        android:padding="6dp"
                        android:text="快递"
                        android:textSize="14sp"
                android:textStyle="bold"/>

            <TextView
                    <com.example.firstapp.view.UnderlineTextView
                android:id="@+id/tabFinance"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="财务"
                android:gravity="center"
                android:padding="8dp"
                android:textSize="16sp"/>
                        android:padding="6dp"
                        android:text="还款"
                        android:textSize="14sp" />

            <TextView
                android:id="@+id/others"
                    <com.example.firstapp.view.UnderlineTextView
                        android:id="@+id/tabIncome"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="其他"
                android:gravity="center"
                android:padding="8dp"
                android:textSize="16sp"/>
                        android:padding="6dp"
                        android:text="收入"
                        android:textSize="14sp" />

                    <com.example.firstapp.view.UnderlineTextView
                        android:id="@+id/tabFlight"
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:gravity="center"
                        android:padding="6dp"
                        android:text="航班"
                        android:textSize="14sp" />

                    <com.example.firstapp.view.UnderlineTextView
                        android:id="@+id/tabTrain"
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:gravity="center"
                        android:padding="6dp"
                        android:text="火车票"
                        android:textSize="14sp" />

        </LinearLayout>

                <ImageButton
                    android:id="@+id/categoryButton"
                    android:layout_width="28dp"
                    android:layout_height="28dp"
                    android:layout_gravity="center_vertical|end"
                    android:background="?attr/selectableItemBackgroundBorderless"
                    android:contentDescription="分类设置"
                    android:padding="4dp"
                    android:scaleType="fitCenter"
                    android:src="@drawable/home_add" />

            </FrameLayout>

        <!-- 内容区域 -->
        <FrameLayout
@@ -80,6 +119,26 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:padding="8dp"/>

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

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

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

        </FrameLayout>

@@ -103,15 +162,16 @@
    <!-- 顶部广告位 -->
    <androidx.cardview.widget.CardView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
       >
        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"/>
            android:src="@drawable/up_back" />
    </androidx.cardview.widget.CardView>

    <!-- 在适当的位置添加 -->

</FrameLayout>