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

张钢

2024-09-12 f278edbd3f0f809e4a3b59bf16d24c624a43f98d

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

@@ -11,7 +11,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@color/color_normal_background"
        android:background="?attr/pageBackgroundColor"
        android:orientation="vertical"
        >
        <com.android.app_base.widget.ExtendTitleBar
@@ -21,12 +21,14 @@
            app:layout_constraintTop_toTopOf="parent"
            app: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"
                android:visibility="gone"
                >
                <ImageView
                    android:id="@+id/iv_operate"
@@ -209,7 +211,7 @@
                            android:textColorHint="#6b000000"
                            android:textSize="16sp"
                            tools:text="汉族"
                            android:text="@{viewModel.infoLiveData.nationality}"
                            android:text="@{viewModel.infoLiveData.nation}"
                            />

                        <View
@@ -243,7 +245,9 @@
                            android:textColorHint="#6b000000"
                            android:textSize="16sp"
                            tools:text="中国"
                            android:text="@{viewModel.infoLiveData.nation}"
                            android:text="@{viewModel.infoLiveData.nationality}"
                            android:ellipsize="end"
                            android:maxLines="1"
                            />

                        <View
@@ -511,7 +515,7 @@
                            android:id="@+id/rv_relationship"
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:background="@color/color_normal_background"
                            android:background="?attr/pageBackgroundColor"
                            tools:itemCount="3"
                            tools:listitem="@layout/item_growth_experience_relationship" />
                    </LinearLayout>
@@ -603,7 +607,7 @@
                                android:layout_width="0dp"
                                android:layout_height="wrap_content"
                                android:layout_weight="1"
                                android:text="持有出入境证件情况"
                                android:text="持有证件情况"
                                android:textColor="#ff000000"
                                android:textSize="20sp"
                                android:textStyle="bold"