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

Linjiajia

2024-02-28 b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5

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

@@ -12,7 +12,7 @@
    <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
@@ -52,24 +52,6 @@
                    android:textSize="16sp"
                    android:text="@={viewModel.beanLiveData.name}"
                    />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:text="时间"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.time}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
@@ -102,7 +84,7 @@
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.certificateNumber}"
                    android:text="@={viewModel.beanLiveData.idNo}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
@@ -119,7 +101,7 @@
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.level}"
                    android:text="@={viewModel.beanLiveData.grade}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
@@ -136,7 +118,7 @@
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.effectiveTime}"
                    android:text="@={viewModel.beanLiveData.validityDate}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
@@ -153,7 +135,7 @@
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@{viewModel.beanLiveData.getTime}"
                    android:text="@{viewModel.beanLiveData.getDate}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"