修改了国籍和民族字段反转的问题

张钢

2024-09-12 f278edbd3f0f809e4a3b59bf16d24c624a43f98d

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

@@ -12,15 +12,33 @@
    <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.beanLiveData.title}"
            app:title="@{viewModel.beanLiveData.id==0?`新建个人记事本`:viewModel.beanLiveData.title}"
            app:titleGravity="left"
            />
            app:leftIcon="@drawable/ic_back"
            >
            <FrameLayout
                android:layout_width="24dp"
                android:layout_height="24dp"
                android:layout_marginHorizontal="16dp"
                android:layout_gravity="center_vertical|end"
                >

                <ImageView
                    android:id="@+id/iv_operate"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center"
                    android:background="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}" />
            </FrameLayout>
        </com.android.app_base.widget.ExtendTitleBar>

        <ScrollView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@@ -48,9 +66,11 @@
                    android:inputType="text"
                    android:autofillHints="creditCardNumber"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入标题`:``}"
                    android:textColor="#DE000000"
                    android:textSize="16sp"
                    android:text="@{viewModel.beanLiveData.title}"
                    android:text="@={viewModel.beanLiveData.title}"
                    android:enabled="@{viewModel.typeLiveData}"
                    />

                <TextView
@@ -63,13 +83,19 @@
                    />

                <EditText
                    android:id="@+id/et_time"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请选择时间`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.time}"
                    android:textSize="16sp" />
                    android:text="@={viewModel.beanLiveData.happenTime}"
                    android:textSize="16sp"
                    app:isEditable="@{false}"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
@@ -84,9 +110,12 @@
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:text="@={viewModel.beanLiveData.person}"
                    android:hint="@{viewModel.typeLiveData?`请输入人物`:``}"
                    android:text="@={viewModel.beanLiveData.people}"
                    android:textColor="#DE000000"
                    android:textSize="16sp" />
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
@@ -101,9 +130,12 @@
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:hint="@{viewModel.typeLiveData?`请输入地点`:``}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.place}"
                    android:textSize="16sp" />
                    android:text="@={viewModel.beanLiveData.address}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />

                <TextView
                    android:layout_width="wrap_content"
@@ -118,10 +150,13 @@
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:hint="@{viewModel.typeLiveData?`请输入备注`:``}"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@{viewModel.beanLiveData.remark}"
                    android:textSize="16sp" />
                    android:text="@={viewModel.beanLiveData.remark}"
                    android:textSize="16sp"
                    android:enabled="@{viewModel.typeLiveData}"
                    />
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"