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.xml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 1737038..873fb11 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -32,14 +32,15 @@
android:layout_width="match_parent"
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="wrap_content"
@@ -49,7 +50,8 @@
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"
@@ -61,7 +63,6 @@
android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"
android:visibility="gone"
/>
-
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -74,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"
@@ -103,7 +103,6 @@
android:id="@+id/fragment_surveillance_exit_timer"
android:visibility="gone"
/>
-
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -117,14 +116,14 @@
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
-
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/h280dp"
+ android:layout_height="@dimen/h290dp"
android:layout_marginTop="@dimen/h4dp"
android:paddingRight="@dimen/h4dp"
android:orientation="horizontal"
android:layout_weight="0"
+ android:id="@+id/fragment_surveillance_bottom_linear_layout"
>
<RelativeLayout
android:layout_width="wrap_content"
--
Gitblit v1.8.0