1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段

Linjiajia

2024-02-28 b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5

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

@@ -5,7 +5,7 @@
    android:layout_width="211dp"
    android:layout_height="match_parent"
    android:layout_gravity="start"
    android:background="@color/color_card_pink"
    android:background="?attr/drawerBackgroundColor"
    android:paddingTop="25dp"
    >
    <LinearLayout
@@ -23,12 +23,14 @@
            android:gravity="center"
            >
            <androidx.constraintlayout.utils.widget.ImageFilterView
                android:id="@+id/dl_home_user_avatar"
                android:layout_width="50dp"
                android:layout_height="50dp"
                android:scaleType="centerCrop"
                app:roundPercent="1"
                android:background="@drawable/img_sakura"
                />
            <TextView
                android:id="@+id/dl_home_user_name"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="张喵"
@@ -39,7 +41,7 @@
        </LinearLayout>
        <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="304dp"
            android:layout_height="wrap_content"
            app:cardBackgroundColor="@color/white"
            app:cardCornerRadius="10dp"
            app:cardElevation="0dp"
@@ -57,6 +59,7 @@
                    android:textColor="@color/black"
                    android:textSize="12sp"
                    android:layout_marginStart="14dp"
                    android:layout_marginBottom="8dp"
                    />
                <View
                    android:layout_width="match_parent"
@@ -69,12 +72,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_family_root_net"
                        android:layout_width="13dp"
                        android:layout_height="10dp"
                        android:background="?attr/icFunctionFamilyRootNet"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -97,12 +101,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_notes"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionNotes"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -125,12 +130,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_asset"
                        android:layout_width="13dp"
                        android:layout_height="14dp"
                        android:background="?attr/icFunctionAsset"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -153,12 +159,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_home_devices"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionHomeDevices"
                        />

                    <TextView
@@ -182,12 +189,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_honor"
                        android:layout_width="13dp"
                        android:layout_height="12dp"
                        android:background="?attr/icFunctionHonor"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -210,12 +218,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_little_doctor"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionLittleDoctor"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -238,12 +247,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_cleaning"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionCleaning"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -266,12 +276,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_mail_list"
                        android:layout_width="13dp"
                        android:layout_height="14dp"
                        android:background="?attr/icFunctionMailList"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -294,12 +305,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_pet"
                        android:layout_width="13dp"
                        android:layout_height="10dp"
                        android:background="?attr/icFunctionPamperPet"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -322,12 +334,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_income_expense"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionIncomeExpense"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -350,7 +363,7 @@
        </androidx.cardview.widget.CardView>
        <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="240dp"
            android:layout_height="wrap_content"
            app:cardBackgroundColor="@color/white"
            app:cardCornerRadius="10dp"
            app:cardElevation="0dp"
@@ -361,6 +374,7 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:orientation="vertical"
                android:paddingVertical="8dp"
                >
                <TextView
                    android:layout_width="wrap_content"
@@ -368,7 +382,7 @@
                    android:text="个人板块"
                    android:textColor="@color/black"
                    android:textSize="12sp"
                    android:layout_marginVertical="8dp"
                    android:layout_marginBottom="8dp"
                    android:layout_marginStart="14dp"
                    />
                <View
@@ -382,12 +396,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_growth"
                        android:layout_width="13dp"
                        android:layout_height="16dp"
                        android:background="?attr/icFunctionGrowth"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -410,12 +425,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_marriage"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionMarriage"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -438,12 +454,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_property"
                        android:layout_width="13dp"
                        android:layout_height="16dp"
                        android:background="?attr/icFunctionProperty"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -461,16 +478,18 @@
                        />
                </LinearLayout>
                <LinearLayout
                    android:id="@+id/dl_hundred_wish"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_wish"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionWish"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -488,17 +507,18 @@
                        />
                </LinearLayout>
                <LinearLayout
                    android:id="@+id/dl_hundred_wish"
                    android:id="@+id/dl_tourism"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_tour"
                        android:layout_width="13dp"
                        android:layout_height="13dp"
                        android:background="?attr/icFunctionTour"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -521,13 +541,14 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >

                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_health" />
                        android:layout_width="13dp"
                        android:layout_height="12dp"
                        android:background="?attr/icFunctionHealth" />
                    <TextView
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
@@ -549,12 +570,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_certificate"
                        android:layout_width="13dp"
                        android:layout_height="14dp"
                        android:background="?attr/icFunctionCertificate"
                        />
                    <TextView
                        android:layout_width="0dp"
@@ -577,12 +599,13 @@
                    android:layout_height="0dp"
                    android:layout_weight="1"
                    android:paddingHorizontal="15dp"
                    android:layout_marginVertical="3dp"
                    android:gravity="center"
                    >
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_privacy"
                        android:layout_width="13dp"
                        android:layout_height="15dp"
                        android:background="?attr/icFunctionPrivacy"
                        />
                    <TextView
                        android:layout_width="0dp"