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_growth_experience.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/activity_growth_experience.xml b/app/src/main/res/layout/activity_growth_experience.xml
index 8db9405..20ad55c 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/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"
--
Gitblit v1.9.1