From f278edbd3f0f809e4a3b59bf16d24c624a43f98d Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:38:08 +0800
Subject: [PATCH] 修改了国籍和民族字段反转的问题
---
app/src/main/res/layout/activity_honor_collection_detail.xml | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/app/src/main/res/layout/activity_honor_collection_detail.xml b/app/src/main/res/layout/activity_honor_collection_detail.xml
index 6a4b7c7..64b64b9 100644
--- a/app/src/main/res/layout/activity_honor_collection_detail.xml
+++ b/app/src/main/res/layout/activity_honor_collection_detail.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
@@ -11,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
@@ -20,16 +21,16 @@
app:title="@{viewModel.beanLiveData.owner+`鐨刞+ viewModel.beanLiveData.type}"
app:titleGravity="left"
/>
- <ScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/titleBar"
>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="20dp"
- android:paddingBottom="20dp"
>
<TextView
android:layout_width="wrap_content"
@@ -39,8 +40,6 @@
android:textColor="#767375"
android:textSize="12sp"
/>
-
-
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -51,7 +50,6 @@
android:textSize="16sp"
android:text="@={viewModel.beanLiveData.name}"
/>
-
<TextView
android:layout_width="wrap_content"
android:layout_marginTop="10dp"
@@ -60,14 +58,13 @@
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.getTime}"
+ android:text="@={viewModel.beanLiveData.happenTime}"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
@@ -155,35 +152,35 @@
android:text="@={viewModel.beanLiveData.remark}"
android:textSize="16sp" />
<TextView
+ android:id="@+id/textview_elecfile"
android:layout_width="wrap_content"
- android:layout_marginTop="10dp"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_height="wrap_content"
android:text="鐢靛瓙鏂囦欢"
- android:textColor="#767375"
+ android:textColor="#ff000000"
android:textSize="12sp"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- 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>
+ </androidx.core.widget.NestedScrollView>
</LinearLayout>
--
Gitblit v1.9.1