Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2025-10-17 cb6aca0642ac8dd5de877ade168066d85acb589c

 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>