From b17b9aa59bae6d03055f14d937821655dfaffa1f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 29 一月 2024 23:27:08 +0800
Subject: [PATCH] 1、调整成长经历页面\n2、删除婚姻个人信息
---
app/src/main/res/layout/pop_basic_information_double.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/pop_basic_information_double.xml b/app/src/main/res/layout/pop_basic_information_double.xml
index cfd179b..02c9734 100644
--- a/app/src/main/res/layout/pop_basic_information_double.xml
+++ b/app/src/main/res/layout/pop_basic_information_double.xml
@@ -5,6 +5,9 @@
<data>
<variable
+ name="isFamily"
+ type="boolean" />
+ <variable
name="spouseBean"
type="com.application.zhangshi_app_android.bean.HomeRootBean" />
<variable
@@ -190,7 +193,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="6dp"
- android:text="@{`绗琡+ selfBean.identity + `浠}"
+ android:text="@{`绗琡+ selfBean.identity + `浠 + (isFamily?``:`閰嶅伓`)}"
android:textColor="#FF000000"
android:textSize="12sp"
android:layout_gravity="center_vertical"
@@ -233,7 +236,7 @@
android:textSize="12sp"
app:autoSizeTextType="uniform"
app:autoSizeMaxTextSize="16sp"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
android:ellipsize="end"
android:maxLines="1"
android:layout_gravity="center"
@@ -945,7 +948,7 @@
android:paddingHorizontal="6dp"
android:layout_gravity="center_vertical"
app:textOverflowMode="@{4}"
- android:text="@{`绗琡 + spouseBean.identity + `浠}"
+ android:text="@{`绗琡 + spouseBean.identity + `浠+ (isFamily?`閰嶅伓`:``)}"
android:textColor="#FF000000"
android:textSize="12sp"
/>
@@ -986,7 +989,7 @@
android:textSize="12sp"
app:autoSizeTextType="uniform"
app:autoSizeMaxTextSize="16sp"
- app:autoSizeMinTextSize="10sp"
+ app:autoSizeMinTextSize="8sp"
android:ellipsize="end"
android:maxLines="1"
android:layout_gravity="center"
--
Gitblit v1.9.1