From 0a7e6639ae4e193de0e15c86fde488c950f315d0 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 20:53:24 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
index d0d285b..905003d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
@@ -5,41 +5,59 @@
android:layout_height="wrap_content"
xmlns:fresco="http://schemas.android.com/apk/res-auto"
>
-
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_home_bottom_visitor_cell_photo"
- android:layout_width="122dp"
- android:layout_height="127dp"
- fresco:roundedCornerRadius="5dp"
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h127dp"
+ android:layout_alignParentBottom="true"
+ android:scaleType="centerCrop"
+ android:paddingTop="@dimen/h5dp"
+ android:paddingRight="@dimen/w5dp"
+ android:paddingLeft="@dimen/w5dp"
+ android:paddingBottom="@dimen/h5dp"
+ />
+ <!--
+ <com.facebook.drawee.view.SimpleDraweeView
+ android:id="@+id/fragment_home_bottom_visitor_cell_photo"
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h127dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
/>
+ -->
<TextView
android:id="@+id/fragment_home_bottom_visitor_cell_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/colorRed"
- android:paddingRight="7dp"
- android:paddingLeft="10dp"
- android:paddingTop="2dp"
- android:paddingBottom="2dp"
- android:textSize="@dimen/text_size_big"
+ android:paddingRight="@dimen/w7dp"
+ android:paddingLeft="@dimen/w10dp"
+ android:layout_marginTop="@dimen/h10dp"
+ android:paddingBottom="@dimen/h2dp"
+ android:textSize="@dimen/w16dp"
android:text="璀︽姤"
android:textColor="@android:color/white"
- android:layout_alignParentRight="true"/>
+ android:layout_alignParentRight="true"
+ android:visibility="visible"
+ />
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="20dp"
- android:background="#40000000"
- android:layout_alignParentBottom="true">
-
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h35dp"
+ android:layout_alignParentBottom="true"
+ android:visibility="visible"
+ android:paddingBottom="@dimen/h7dp"
+ android:paddingRight="@dimen/w7dp"
+ android:paddingLeft="@dimen/w7dp"
+ >
<TextView
android:id="@+id/fragment_home_bottom_visitor_cell_name"
android:layout_width="@dimen/view_size_0"
android:layout_height="match_parent"
android:layout_weight="1"
android:text=""
- android:textSize="@dimen/text_size_small"
+ android:textSize="@dimen/w10dp"
+ android:background="#40000000"
android:gravity="center"
android:textColor="@android:color/white"/>
<View
@@ -51,8 +69,9 @@
android:layout_width="@dimen/view_size_0"
android:layout_height="match_parent"
android:layout_weight="1"
- android:text="鏉ヨ鐧昏"
- android:textSize="@dimen/text_size_small"
+ android:text="鏉ヨ"
+ android:background="#40F6335A"
+ android:textSize="@dimen/w10dp"
android:gravity="center"
android:textColor="@android:color/white"/>
</LinearLayout>
--
Gitblit v1.8.0