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

张钢

2024-09-12 f278edbd3f0f809e4a3b59bf16d24c624a43f98d

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

@@ -10,17 +10,17 @@
    </data>

    <LinearLayout
        tools:context=".ui.function.CreateFamilyProjectActivity"
        tools:context=".ui.function.FamilyMemorabiliaDetailActivity"
        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:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:title="哈哈哈"
            app:titleGravity="left"
            app:title="@{viewModel.beanLiveData.holder + `的` + viewModel.beanLiveData.type}"
            />
        <ScrollView
            android:layout_width="match_parent"
@@ -69,7 +69,7 @@
                    android:layout_marginTop="2dp"
                    android:inputType="text"
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.createTime}"
                    android:text="@={viewModel.beanLiveData.happenTime}"
                    android:textSize="16sp" />
                <TextView
                    android:layout_width="wrap_content"
@@ -156,9 +156,45 @@
                    android:textColor="#DE000000"
                    android:text="@={viewModel.beanLiveData.remark}"
                    android:textSize="16sp" />
                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:gravity="center_vertical"
                    >
                    <TextView
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:text="备忘本"
                        android:textColor="#FF000000"
                        android:textSize="20sp"
                        />
                    <ImageView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:background="@drawable/ic_tourism_add"
                        android:layout_marginEnd="15dp"
                        android:visibility="gone"
                        />
                </LinearLayout>
                <RelativeLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    >
                    <androidx.recyclerview.widget.RecyclerView
                        android:id="@+id/rv_memo"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        tools:listitem="@layout/item_memo"
                        tools:itemCount="2"
                        />
                </RelativeLayout>

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_marginTop="10dp"
                    android:layout_marginTop="15dp"
                    android:layout_height="wrap_content"
                    android:text="电子文件"
                    android:textColor="#767375"
@@ -167,24 +203,23 @@
                <RelativeLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginBottom="20dp"
                    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:background="@drawable/shape_6b0000_stroke"
                        android:layout_marginBottom="20dp"
                        android:layout_marginTop="2dp"
                        android:paddingStart="10dp"
                        android:paddingEnd="5dp"
                        android:paddingVertical="10dp"
                        />

                </RelativeLayout>



            </LinearLayout>
        </ScrollView>