From 243369fef8970eeb635ff21a22b07b495343a7d0 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 16:31:34 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 0995412..bcce184 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -37,9 +37,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
>
- <VideoView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <SurfaceView
+ android:layout_width="640px"
+ android:layout_height="480px"
android:id="@+id/fragment_supervisory_enter_camera" />
<RelativeLayout
android:layout_width="match_parent"
@@ -47,6 +47,7 @@
android:layout_alignParentBottom="true"
android:background="#40000000">
<TextView
+ android:id="@+id/fragment_surveillance_enter_timer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
@@ -67,16 +68,18 @@
android:layout_marginRight="12dp"/>
</RelativeLayout>
</RelativeLayout>
+
<RelativeLayout
android:layout_width="@dimen/view_size_0"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginLeft="2dp"
>
- <VideoView
+ <SurfaceView
android:id="@+id/fragment_supervisory_exit_camera"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
<RelativeLayout
android:layout_width="match_parent"
@@ -90,7 +93,9 @@
android:textSize="@dimen/text_size_normal"
android:textColor="@android:color/white"
android:layout_marginLeft="16dp"
- android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"/>
+ android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"
+ android:id="@+id/fragment_surveillance_exit_timer"
+ />
<TextView
android:layout_width="wrap_content"
--
Gitblit v1.8.0