From 55e3f5761aae3dca19b0e417c05043d718891af0 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 10:47:42 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 637da4d..e0dd6b4 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
@@ -15,7 +15,37 @@
android:layout_height="@dimen/h76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
+ <TextView
+ android:id="@+id/fragment_device_right_delete"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
+ 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="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
+ android:gravity="center"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:textColor="@android:color/white"
+ android:background="@drawable/u249"
+ android:text=""/>
+ <TextView
+ android:id="@+id/fragment_device_right_save"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
+ android:gravity="center"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:layout_marginRight="@dimen/w10dp"
+ android:textColor="@android:color/white"
+ android:background="@drawable/u208"
+ android:text=""/>
</LinearLayout>
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
android:layout_width="@dimen/w596dp"
@@ -34,7 +64,7 @@
android:textSize="@dimen/w16dp"
android:text="鎽勫儚鏈�1"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
- android:layout_marginBottom="@dimen/h25dp"
+ android:layout_marginBottom="@dimen/h20dp"
/>
<View
android:layout_width="match_parent"
@@ -51,13 +81,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginTop="@dimen/h10dp"
android:textSize="@dimen/w14dp"
android:layout_marginBottom="@dimen/h6dp"
android:text="鎽勫儚鏈哄搧鐗�"
/>
<EditText
- android:id="@+id/fragment_check_in_right_visitor_reason"
+ android:id="@+id/fragment_device_right_camera1_brand"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -82,12 +112,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginTop="@dimen/h10dp"
android:textSize="@dimen/w14dp"
android:layout_marginBottom="@dimen/h6dp"
android:text="IP"
/>
<EditText
+ android:id="@+id/fragment_device_right_camera1_ip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -112,7 +143,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginTop="@dimen/h10dp"
android:textSize="@dimen/w14dp"
android:layout_marginBottom="@dimen/h6dp"
android:text="绔彛"
@@ -142,7 +173,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginTop="@dimen/h10dp"
android:textSize="@dimen/w14dp"
android:layout_marginBottom="@dimen/h6dp"
android:text="鍒嗚鲸鐜�"
@@ -172,7 +203,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginTop="@dimen/h10dp"
android:textSize="@dimen/w14dp"
android:layout_marginBottom="@dimen/h6dp"
android:text="鐢ㄦ埛鍚�"
@@ -202,7 +233,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginTop="@dimen/h10dp"
android:textSize="@dimen/w14dp"
android:layout_marginBottom="@dimen/h6dp"
android:text="瀵嗙爜"
@@ -224,6 +255,7 @@
android:background="@color/colorText_b"/>
</LinearLayout>
</LinearLayout>
+ </ScrollView>
</LinearLayout>
</ScrollView>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0