From 15d0c49e85159b9e27870aff5280c0cd95b103c4 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 04 五月 2017 17:16:56 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 175 ++++++++++++++-------------------------------------------
1 files changed, 44 insertions(+), 131 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml
index f3b2cf0..5531609 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml
@@ -12,155 +12,68 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="76dp"
+ android:layout_height="@dimen/h76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
- <TextView
- android:id="@+id/fragment_device_right_delete"
- android:layout_width="40dp"
- android:layout_height="36dp"
- android:gravity="center"
- android:textColor="@android:color/white"
- android:background="@drawable/u194"
- android:text=""/>
- <TextView
- android:id="@+id/fragment_device_right_add"
- android:layout_width="40dp"
- android:layout_height="36dp"
- android:gravity="center"
- android:layout_marginLeft="10dp"
- android:textColor="@android:color/white"
- android:background="@drawable/u249"
- android:text=""/>
- <TextView
- android:id="@+id/fragment_device_right_save"
- android:layout_width="40dp"
- android:layout_height="36dp"
- android:gravity="center"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
- android:textColor="@android:color/white"
- android:background="@drawable/u208"
- android:text=""/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
- android:layout_width="596dp"
+ android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
>
<LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
- android:gravity="center_horizontal"
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h20dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/colorPrimary"
+ android:textStyle="bold"
+ android:textSize="@dimen/w16dp"
+ android:text="鎽勫儚鏈�1璁剧疆"
+ android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
+ />
+ <EditText
+ android:id="@+id/fragment_check_in_right_visitor_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_weight="1"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_navigation"
- android:text="camer1"
- android:gravity="left"
- android:layout_gravity="left"
- android:textColor="@color/colorPrimary"/>
- </LinearLayout>
- <Switch
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:checked="true"
- />
- </LinearLayout>
+ android:background="@null"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text="鎽勫儚澶�1"
+ android:textSize="@dimen/w14dp"
+ android:textColor="@color/colorText_b"
+ />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
- android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
- </LinearLayout>
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <LinearLayout
- android:paddingTop="13dp"
- android:gravity="center_horizontal"
+ android:background="@color/colorText_b"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/colorPrimary"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h20dp"
+ android:textSize="@dimen/w16dp"
+ android:text="IP鍦板潃"/>
+ <EditText
+ android:id="@+id/fragment_check_in_right_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_weight="1"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
- android:text="閫夋嫨缃戠粶"
- android:gravity="left"
- android:layout_gravity="left"
- android:textColor="@color/colorText_b"
- />
- </LinearLayout>
- </LinearLayout>
- </LinearLayout>
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
- android:gravity="center_horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_weight="1"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
- android:text="缃戠粶1"
- android:gravity="left"
- android:layout_gravity="left"
- />
- </LinearLayout>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/u39"
- />
- <TextView
- android:layout_width="10dp"
- android:layout_height="wrap_content"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/u41"
- />
- </LinearLayout>
+ android:background="@null"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:hint=""
+ android:textColorHint="@color/colorText_b"
+ android:textSize="@dimen/w14dp"
+ android:textColor="@color/colorText_b"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
- android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:background="@color/colorText_b"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0