功能全部完成

Linjiajia

2023-08-27 1df231fd6aafa221aef3532d069c7e27d4331be7

 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,80 +18,60 @@
        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
                    android:layout_width="@dimen/dp_24"
                    android:layout_height="@dimen/dp_24"
                    android:background="@drawable/ic_search" />
                    android:id="@+id/iv_operate_select"
                    android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:background="@drawable/ic_operate_select_white" />

                <ImageView
                    android:layout_width="@dimen/dp_24"
                    android:layout_height="@dimen/dp_24"
                    android:layout_marginStart="@dimen/dp_16"
                    android:id="@+id/iv_operate"
                    android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_marginStart="16dp"
                    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="0dp"
            app:layout_constraintDimensionRatio="16:9"
            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>
        </FrameLayout>

        <LinearLayout
            android:layout_width="match_parent"
@@ -101,7 +80,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 +130,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"
@@ -159,8 +138,8 @@
                        app:layout_constraintTop_toBottomOf="@id/tv_core_module">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_family_root_net" />

                        <TextView
@@ -182,8 +161,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
@@ -205,8 +184,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="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_asset" />

                        <TextView
@@ -228,8 +207,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="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_honor" />

                        <TextView
@@ -254,8 +233,8 @@
                        >

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_little_doctor"
                            />
                        <TextView
@@ -279,8 +258,8 @@
                        >

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_cleaning"
                            />
                        <TextView
@@ -303,8 +282,8 @@
                        app:layout_constraintTop_toTopOf="@id/layout_little_doctor">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_mail_list" />

                        <TextView
@@ -326,8 +305,8 @@
                        app:layout_constraintTop_toTopOf="@id/layout_little_doctor">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_pamper_pet" />

                        <TextView
@@ -351,8 +330,8 @@
                        app:layout_constraintTop_toBottomOf="@+id/layout_little_doctor">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_income_expense" />

                        <TextView
@@ -360,6 +339,30 @@
                            android:layout_height="wrap_content"
                            android:layout_marginTop="@dimen/dp_4"
                            android:text="收支台账"
                            android:textColor="@color/black"
                            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>
@@ -380,7 +383,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"
@@ -388,8 +391,8 @@
                        app:layout_constraintTop_toBottomOf="@id/tv_personal_module">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_growth" />

                        <TextView
@@ -411,8 +414,8 @@
                        app:layout_constraintTop_toTopOf="@id/layout_growing_up">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_marriage" />

                        <TextView
@@ -435,8 +438,8 @@
                        app:layout_constraintTop_toTopOf="@+id/layout_growing_up">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_property"/>

                        <TextView
@@ -458,8 +461,8 @@
                        app:layout_constraintTop_toTopOf="@+id/layout_growing_up">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_wish"/>

                        <TextView
@@ -483,8 +486,8 @@
                        app:layout_constraintTop_toBottomOf="@+id/layout_growing_up">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_tour" />

                        <TextView
@@ -507,8 +510,8 @@
                        app:layout_constraintTop_toTopOf="@+id/layout_tourism">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_health" />

                        <TextView
@@ -531,8 +534,8 @@
                        app:layout_constraintTop_toTopOf="@+id/layout_tourism">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_honor" />

                        <TextView
@@ -555,8 +558,8 @@
                        app:layout_constraintTop_toTopOf="@+id/layout_tourism">

                        <ImageView
                            android:layout_width="@dimen/dp_24"
                            android:layout_height="@dimen/dp_24"
                            android:layout_width="24dp"
                            android:layout_height="24dp"
                            android:background="@drawable/function_privacy" />

                        <TextView
@@ -576,24 +579,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>