基本功能完成

Linjiajia

2023-07-25 82e57df230ecb744af6c8865f80870ba03c86d89

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

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< Updated upstream


<layout
=======
<layout xmlns:tools="http://schemas.android.com/tools"
>>>>>>> Stashed changes
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:android="http://schemas.android.com/apk/res/android">
    xmlns:android="http://schemas.android.com/apk/res/android"
    >

    <data>
        <variable
@@ -19,52 +18,20 @@
        android:background="@color/color_normal_background"
        android:orientation="vertical"
        >

        <com.hjq.bar.TitleBar
        <com.android.app_base.widget.ExtendTitleBar
            android:id="@+id/titleBar"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_55"
<<<<<<< Updated upstream
            android:background="@color/color_title_bar_background"
=======
            android:id="@+id/title_t_bar"
            app:layout_constraintTop_toTopOf="parent"
            android:background="@color/color_title_background"
>>>>>>> Stashed changes
            android:paddingHorizontal="@dimen/dp_16"
            app:layout_constraintEnd_toEndOf="parent"
            app:titleGravity="left"
            app:title="功能"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            app:leftIcon="@null"
            app:rightIcon="@null">

            <LinearLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="start|center_vertical"
                android:orientation="horizontal">

                <ImageView
                    android:id="@+id/menu"
                    android:layout_width="@dimen/dp_24"
                    android:layout_height="@dimen/dp_24"
                    android:layout_gravity="center"
                    android:background="@drawable/ic_menu" />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="@dimen/dp_32"
                    android:text="@string/title_function"
                    android:textColor="@color/white"
                    android:textSize="@dimen/sp_20" />

            </LinearLayout>

            >
            <LinearLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="end|center_vertical"
                android:layout_marginHorizontal="16dp"
                android:orientation="horizontal">

                <ImageView
@@ -73,26 +40,62 @@
                    android:background="@drawable/ic_search" />

                <ImageView
                    android:id="@+id/iv_operate"
                    android:layout_width="@dimen/dp_24"
                    android:layout_height="@dimen/dp_24"
                    android:layout_marginStart="@dimen/dp_16"
                    android:background="@drawable/ic_operate" />

            </LinearLayout>
        </com.android.app_base.widget.ExtendTitleBar>

        </com.hjq.bar.TitleBar>

<<<<<<< Updated upstream

        <ImageView
            android:id="@+id/iv_group_photo"
        <FrameLayout
            android:id="@+id/layout_banner"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_200"
            android:background="@drawable/margin_pic"
            android:layout_height="200dp"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/titleBar"
            />
            >
            <FrameLayout
                android:id="@+id/layout_frame"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:background="@color/color_card_pink"
                >
                <ImageView
                    android:id="@+id/iv_banner"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    />
            </FrameLayout>
            <RelativeLayout
                android:id="@+id/layout_data_null"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:orientation="vertical"
                >
                <ImageView
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:src="@drawable/img_data_null"
                    android:scaleType="center"
                    />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="空空如也~"
                    android:textColor="#73000000"
                    android:layout_gravity="center"
                    android:layout_centerHorizontal="true"
                    android:layout_alignParentBottom="true"
                    android:layout_marginBottom="10dp"
                    />
            </RelativeLayout>

        </FrameLayout>

        <LinearLayout
            android:layout_width="match_parent"
@@ -101,7 +104,7 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintTop_toBottomOf="@id/iv_group_photo"
            app:layout_constraintTop_toBottomOf="@id/layout_banner"
            >
            <androidx.core.widget.NestedScrollView
                android:layout_width="match_parent"
@@ -151,7 +154,7 @@
                        android:id="@+id/layout_home_root_net"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="@dimen/dp_15"
                        android:layout_marginTop="15dp"
                        android:gravity="center"
                        android:orientation="vertical"
                        app:layout_constraintEnd_toStartOf="@+id/gl_v_0.25"
@@ -182,8 +185,8 @@
                        app:layout_constraintTop_toTopOf="@id/layout_home_root_net">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:background="@drawable/function_notes" />

                        <TextView
@@ -364,6 +367,30 @@
                            android:textSize="@dimen/sp_14" />
                    </LinearLayout>

                    <LinearLayout
                        android:id="@+id/layout_home_devices"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:gravity="center"
                        android:orientation="vertical"
                        app:layout_constraintEnd_toEndOf="@id/layout_family_memorabilia"
                        app:layout_constraintStart_toStartOf="@id/layout_family_memorabilia"
                        app:layout_constraintTop_toTopOf="@+id/layout_income_and_expenses">

                        <ImageView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:background="@drawable/function_home_devices" />

                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_marginTop="@dimen/dp_4"
                            android:text="家庭设备"
                            android:textColor="@color/black"
                            android:textSize="@dimen/sp_14" />
                    </LinearLayout>

                    <TextView
                        android:id="@+id/tv_personal_module"
                        android:layout_width="wrap_content"
@@ -380,7 +407,7 @@
                        android:id="@+id/layout_growing_up"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="@dimen/dp_15"
                        android:layout_marginTop="15dp"
                        android:gravity="center"
                        android:orientation="vertical"
                        app:layout_constraintEnd_toStartOf="@+id/gl_v_0.25"
@@ -576,24 +603,5 @@



=======
        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            >
        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            >
            <ImageView
                android:id="@+id/imageView_m/argin_pic"
                android:layout_width="@dimen/dp_360"
                android:layout_height="@dimen/dp_202"
                app:srcCompat="@drawable/margin_pic"
</LinearLayout>
    </LinearLayout>
>>>>>>> Stashed changes
    </androidx.constraintlayout.widget.ConstraintLayout>
</layout>