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

张钢

2024-09-12 f278edbd3f0f809e4a3b59bf16d24c624a43f98d

 app/src/main/res/layout/activity_hundred_wish_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
@@ -25,181 +25,184 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            >

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:orientation="vertical"
                android:paddingHorizontal="20dp"
                android:paddingBottom="20dp"
                >
                android:scrollbarAlwaysDrawVerticalTrack="true">

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="@dimen/dp_10"
                    android:layout_height="@dimen/dp_20"
                    android:layout_marginTop="@dimen/dp_10"
                    android:text="理想标题/百年愿望"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />


                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:inputType="text"
                    android:autofillHints="creditCardNumber"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:textSize="16sp"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.title}"
                    />
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />

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

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.happenTime}"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.createTime}"
                    android:textSize="16sp" />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="始于何因"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:text="@={viewModel.beanLiveData.reason}"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.cause}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />

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

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.beneficiary}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />

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

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.heir}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="实现难度"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.difficulty}"
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="是否依旧有效"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:inputType="textMultiLine"
                    android:text="@={viewModel.beanLiveData.isEffective}"
                    android:textColor="#DE000000"
                    android:text="@{viewModel.beanLiveData.isEffective==1?`是`:`否`}"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp" />

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

                <EditText
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColorHint="#6b000000"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.remark}"
                    android:textSize="16sp" />
                    android:textColor="#DE000000"
                    android:textColorHint="#6b000000"
                    android:textSize="16sp"
                    android:inputType="textMultiLine"
                    />

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:text="电子文件"
                    android:textColor="#767375"
                    android:textSize="12sp"
                    />
                    android:textSize="12sp" />

                <RelativeLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:background="@drawable/shape_6b0000_stroke"
                    >
                    android:background="@drawable/shape_6b0000_stroke">

                    <com.android.app_base.widget.WrapRecyclerView
                        android:id="@+id/rv_image"
                        android:orientation="vertical"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginBottom="10dp"
                        android:layout_marginTop="2sp"
                        android:paddingStart="10dp"
                        android:paddingEnd="5dp"
                        android:layout_marginBottom="10dp"
                        android:orientation="vertical"
                        android:paddingVertical="10dp"
                        />

                        android:paddingStart="10dp"
                        android:paddingEnd="5dp" />
                </RelativeLayout>


            </LinearLayout>
        </ScrollView>