From c7caa54d8d58af6159f2c758ad5d6687d461a333 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 10:53:23 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
index 9ef0f39..b3c350c 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:id="@+id/fragment_check_in_left_parent"
+ >
<TextView
android:id="@+id/fragment_device_back"
android:layout_width="wrap_content"
@@ -11,13 +13,15 @@
android:layout_marginTop="@dimen/h10dp"
android:layout_centerVertical="true"
android:textColor="#8BD2F6"
+ android:textSize="@dimen/w14dp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorSearch"
- android:orientation="vertical">
- <EditText
+ android:orientation="vertical"
+ >
+ <cn.com.basic.face.widget.checkin.SearchEditText
android:id="@+id/fragment_device_left_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -28,7 +32,9 @@
android:gravity="center"
android:hint="Search"
android:textColorHint="@color/colorSearch"
- android:background="@drawable/visitor_register_search_et"/>
+ android:background="@drawable/visitor_register_search_et"
+ android:textSize="@dimen/w14dp"/>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -38,7 +44,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"
android:background="@color/colorBackground"
android:padding="@dimen/w22dp"
@@ -72,7 +78,7 @@
android:drawableLeft="@drawable/u216"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
</RelativeLayout>
@@ -102,7 +108,7 @@
android:drawableLeft="@drawable/u222"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
@@ -110,7 +116,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorText_b"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
/>
</RelativeLayout>
<RelativeLayout
@@ -139,7 +145,7 @@
android:drawableLeft="@drawable/u325"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
<View
@@ -152,10 +158,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"
android:background="@color/colorBackground"
- android:padding="22dp"
+ android:padding="@dimen/w22dp"
android:text="@string/device_camera"/>
<RelativeLayout
android:background="@android:color/white"
@@ -183,7 +189,7 @@
android:drawableLeft="@drawable/u233"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
</RelativeLayout>
@@ -203,8 +209,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/h56dp"
android:orientation="vertical"
- android:layout_marginLeft="@dimen/w20dp"
- android:layout_marginRight="@dimen/w20dp"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w30dp"
android:layout_toRightOf="@id/fragment_device_left_camera2_check_box">
<TextView
android:layout_width="wrap_content"
@@ -213,7 +219,7 @@
android:drawableLeft="@drawable/u233"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
<View
--
Gitblit v1.8.0