From bf63e9396cde256efe8592c20f7d307e3a6a3221 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 16:23:37 +0800
Subject: [PATCH] add lic

---
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 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 ca00f2b..873fb11 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -30,24 +30,28 @@
     </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"
             android:layout_weight="1"
+            android:id="@+id/fragment_supervisory_enter_camera_relative_layout"
             >
             <SurfaceView
-                android:layout_width="640px"
-                android:layout_height="480px"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:id="@+id/fragment_supervisory_enter_camera" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/h50dp"
                 android:layout_alignParentBottom="true"
-                android:background="#40000000">
+                android:background="#40000000"
+                >
                 <TextView
                     android:id="@+id/fragment_surveillance_enter_timer"
                     android:layout_width="wrap_content"
@@ -56,8 +60,9 @@
                     android:textSize="@dimen/w14dp"
                     android:textColor="@android:color/white"
                     android:layout_marginLeft="@dimen/w16dp"
-                    android:text="2016骞�12鏈�5鏃�  17锛�03锛�42鍒�"/>
-
+                    android:text="2016骞�12鏈�5鏃�  17锛�03锛�42鍒�"
+                    android:visibility="gone"
+                    />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -70,19 +75,18 @@
                     android:layout_marginRight="@dimen/w122dp"/>
             </RelativeLayout>
         </RelativeLayout>
-
         <RelativeLayout
             android:layout_width="@dimen/view_size_0"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:layout_marginLeft="@dimen/w2dp"
+            android:id="@+id/fragment_supervisory_exit_camera_relative_layout"
             >
             <SurfaceView
                 android:id="@+id/fragment_supervisory_exit_camera"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 />
-
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/h50dp"
@@ -97,8 +101,8 @@
                     android:layout_marginLeft="@dimen/w16dp"
                     android:text="2016骞�12鏈�5鏃�  17锛�03锛�42鍒�"
                     android:id="@+id/fragment_surveillance_exit_timer"
+                    android:visibility="gone"
                     />
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -112,13 +116,15 @@
             </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"
+        android:id="@+id/fragment_surveillance_bottom_linear_layout"
+        >
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent">
@@ -156,7 +162,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"
@@ -183,7 +188,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