From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/res/layout/face_rcv_item.xml | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/keyCabinet-android/app/src/main/res/layout/face_rcv_item.xml b/keyCabinet-android/app/src/main/res/layout/face_rcv_item.xml
index 942cdf6..3988d0a 100644
--- a/keyCabinet-android/app/src/main/res/layout/face_rcv_item.xml
+++ b/keyCabinet-android/app/src/main/res/layout/face_rcv_item.xml
@@ -48,7 +48,7 @@
android:layout_toRightOf="@id/circle_user"
android:layout_marginLeft="15dp"
android:textSize="18sp"
- android:text="@{data.name}"
+ android:text="@{data.memberName}"
android:textColor="@color/white"
/>
@@ -59,7 +59,7 @@
android:layout_toRightOf="@id/circle_user"
android:layout_marginLeft="15dp"
android:textSize="14sp"
- android:text='@{"0".equals(data.type)?@string/face_hy:@string/face_xy}'
+ android:text='@{"1".equals(data.groupId)?@string/face_hy:@string/face_xy}'
android:textColor="@color/white"
android:layout_marginTop="20dp"
android:layout_below="@+id/text_user_name"/>
@@ -69,17 +69,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
-
- <TextView
- android:id="@+id/text_user_ctime"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{data.editTime}"
- android:textColor="@color/white"
- android:visibility="visible"
- android:layout_alignParentRight="true"
- android:layout_alignBottom="@+id/circle_user"
- android:layout_marginRight="12dp"/>
</RelativeLayout>
</RelativeLayout>
--
Gitblit v1.9.3