From d289fd8eb7a6581da0dd9c9963c15b6e7c08d744 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 27 六月 2017 09:48:34 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
index 1672d5a..8833908 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -30,10 +30,12 @@
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/h350dp"
+ android:layout_height="0dp"
android:orientation="horizontal"
- android:paddingLeft="2dp"
- android:paddingRight="2dp">
+ android:paddingLeft="@dimen/w2dp"
+ android:paddingRight="@dimen/w2dp"
+ android:layout_weight="1"
+ >
<RelativeLayout
android:layout_width="@dimen/view_size_0"
android:layout_height="match_parent"
@@ -59,7 +61,6 @@
android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"
android:visibility="gone"
/>
-
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -72,7 +73,6 @@
android:layout_marginRight="@dimen/w122dp"/>
</RelativeLayout>
</RelativeLayout>
-
<RelativeLayout
android:layout_width="@dimen/view_size_0"
android:layout_height="match_parent"
@@ -84,7 +84,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
-
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/h50dp"
@@ -101,7 +100,6 @@
android:id="@+id/fragment_surveillance_exit_timer"
android:visibility="gone"
/>
-
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,13 +113,14 @@
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
-
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="@dimen/h290dp"
android:layout_marginTop="@dimen/h4dp"
android:paddingRight="@dimen/h4dp"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:layout_weight="0"
+ >
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
@@ -159,7 +158,6 @@
android:layout_width="@dimen/w5dp"
android:layout_height="match_parent"
android:orientation="vertical">
-
<View
android:id="@+id/fragment_supervisory_bottom_visitor_background"
android:layout_width="match_parent"
@@ -186,7 +184,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"/>
-
<cn.com.basic.face.widget.surveilance.SurveillanceBottomAttendanceListView
android:id="@+id/fragment_supervisory_bottom_attendance_list_view"
android:layout_width="wrap_content"
--
Gitblit v1.8.0