From ef157b4ed50a2dc0b561681ca67f1ccfd421a6bc Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 10:28:19 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 20 +++++++++++---------
1 files changed, 11 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 3e47012..ca00f2b 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -13,6 +13,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="瀹炴椂鐩戞帶"
+ android:textSize="@dimen/w14dp"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/w10dp"
android:layout_marginTop="@dimen/h10dp"
@@ -22,6 +23,7 @@
android:layout_height="wrap_content"
android:text="浜鸿劯璇嗗埆璁垮绯荤粺"
android:gravity="center"
+ android:textSize="@dimen/w14dp"
android:layout_centerInParent="true"
/>
@@ -51,16 +53,16 @@
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:layout_marginLeft="@dimen/w16dp"
android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"/>
<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"
@@ -73,7 +75,7 @@
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"
>
<SurfaceView
android:id="@+id/fragment_supervisory_exit_camera"
@@ -90,7 +92,7 @@
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="@dimen/w16dp"
android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"
@@ -101,12 +103,12 @@
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>
@@ -131,7 +133,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"
@@ -146,7 +148,7 @@
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>
--
Gitblit v1.8.0