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

Linjiajia

2024-02-28 b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5

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

@@ -12,14 +12,14 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@color/color_normal_background"
        android:background="?attr/detailPageBackgroundColor"
        android:orientation="vertical">

        <com.android.app_base.widget.ExtendTitleBar
            android:id="@+id/titleBar"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:title="@{viewModel.beanMutableLiveData.id==0?`新增家大事记`:viewModel.beanMutableLiveData.title}"
            app:title="@{viewModel.beanLiveData.id==0?`新增家大事记`:viewModel.beanLiveData.title}"
            app:titleGravity="left"
            >
            <FrameLayout
@@ -27,6 +27,7 @@
                android:layout_height="24dp"
                android:layout_marginHorizontal="16dp"
                android:layout_gravity="center_vertical|end"
                android:visibility="@{viewModel.beanLiveData.ownData==1}"
                >
                <ImageView
                    android:id="@+id/iv_operate"
@@ -69,7 +70,7 @@
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:textSize="16sp"
                    android:text="@={viewModel.beanMutableLiveData.title}"
                    android:text="@={viewModel.beanLiveData.title}"
                    android:enabled="@{viewModel.typeLiveData}"
                    />

@@ -88,13 +89,13 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/dp_2"
                    android:hint="@{viewModel.typeLiveData?`请输入时间(格式：2001-01-01)`:``}"
                    android:hint="@{viewModel.typeLiveData?`请选择时间`:``}"
                    android:inputType="text"
                    android:text="@={viewModel.beanMutableLiveData.happenTime}"
                    android:text="@={viewModel.beanLiveData.happenTime}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp"
                    android:clickable="@{viewModel.typeLiveData}"
                    android:enabled="@{viewModel.typeLiveData}"
                    app:isEditable="@{false}"
                    />

@@ -117,7 +118,7 @@
                    android:inputType="text"
                    android:hint="@{viewModel.typeLiveData?`请输入人物`:``}"
                    android:textColorHint="#6b000000"
                    android:text="@={viewModel.beanMutableLiveData.people}"
                    android:text="@={viewModel.beanLiveData.people}"
                    android:textColor="#DE000000"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
@@ -141,7 +142,7 @@
                    android:hint="@{viewModel.typeLiveData?`请输入地点`:``}"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanMutableLiveData.address}"
                    android:text="@={viewModel.beanLiveData.address}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
@@ -165,7 +166,7 @@
                    android:hint="@{viewModel.typeLiveData?`请输入备注`:``}"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanMutableLiveData.remark}"
                    android:text="@={viewModel.beanLiveData.remark}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />