From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 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 7d45b81..1672d5a 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -6,29 +6,31 @@
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="30dp"
+ android:layout_height="@dimen/h30dp"
android:background="@color/colorPrimary"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="瀹炴椂鐩戞帶"
+ android:textSize="@dimen/w14dp"
android:layout_centerVertical="true"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="10dp"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:layout_marginTop="@dimen/h10dp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="浜鸿劯璇嗗埆璁垮绯荤粺"
android:gravity="center"
+ android:textSize="@dimen/w14dp"
android:layout_centerInParent="true"
/>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="350dp"
+ android:layout_height="@dimen/h350dp"
android:orientation="horizontal"
android:paddingLeft="2dp"
android:paddingRight="2dp">
@@ -37,71 +39,79 @@
android:layout_height="match_parent"
android:layout_weight="1"
>
- <VideoView
+ <SurfaceView
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/view_size_50"
+ android:layout_height="@dimen/h50dp"
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"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@android:color/white"
- android:layout_marginLeft="16dp"
- android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"/>
+ android:layout_marginLeft="@dimen/w16dp"
+ android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"
+ android:visibility="gone"
+ />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@android:color/white"
android:layout_alignParentRight="true"
android:background="@drawable/surface_info_bcg"
android:text="鎽勫儚鏈鸿繘"
- android:layout_marginRight="12dp"/>
+ 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="2dp"
+ android:layout_marginLeft="@dimen/w2dp"
>
- <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"
- android:layout_height="@dimen/view_size_50"
+ android:layout_height="@dimen/h50dp"
android:layout_alignParentBottom="true"
android:background="#40000000">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@android:color/white"
- android:layout_marginLeft="16dp"
- android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"/>
+ 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"
android:layout_centerVertical="true"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@android:color/white"
android:layout_alignParentRight="true"
android:background="@drawable/surface_info_bcg"
android:text="鎽勫儚鏈哄嚭"
- android:layout_marginRight="12dp"/>
+ android:layout_marginRight="@dimen/w12dp"/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
@@ -109,14 +119,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="4dp"
- android:paddingRight="4dp"
+ android:layout_marginTop="@dimen/h4dp"
+ android:paddingRight="@dimen/h4dp"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
<RadioGroup
- android:layout_width="64dp"
+ android:layout_width="@dimen/w64dp"
android:layout_height="match_parent"
android:id="@+id/fragment_supervisory_bottom_left_radio_group">
@@ -126,7 +136,7 @@
android:layout_height="@dimen/view_size_0"
android:layout_weight="1"
android:textColor="@color/colorPrimary"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:button="@null"
android:gravity="center"
android:checked="true"
@@ -141,12 +151,12 @@
android:button="@null"
android:gravity="center"
android:textColor="@color/colorPrimary"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:background="@drawable/one_bottom_tab_bcg"
android:text="鑰冨嫟"/>
</RadioGroup>
<LinearLayout
- android:layout_width="5dp"
+ android:layout_width="@dimen/w5dp"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -171,13 +181,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
- <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView
+ <cn.com.basic.face.widget.surveilance.SurveillanceBottomVisitorListView
android:id="@+id/fragment_supervisory_bottom_visit_list_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"/>
- <cn.com.basic.face.widget.surveilance.SupervisoryBottomListView
+ <cn.com.basic.face.widget.surveilance.SurveillanceBottomAttendanceListView
android:id="@+id/fragment_supervisory_bottom_attendance_list_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
--
Gitblit v1.8.0