From d3ea1a0c02ec5502672b0ad9bc9a7cdaeeba69de Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 04 五月 2017 17:29:16 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 172 ++++++++++++++++-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 172 ++++++++++++++++-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml | 201 ++++++++++----------
3 files changed, 420 insertions(+), 125 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 5531609..637da4d 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
@@ -26,24 +26,45 @@
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:text="鎽勫儚鏈�1"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
+ android:layout_marginBottom="@dimen/h25dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鎽勫儚鏈哄搧鐗�"
/>
<EditText
android:id="@+id/fragment_check_in_right_visitor_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="@dimen/h15dp"
android:layout_marginBottom="@dimen/h12dp"
- android:text="鎽勫儚澶�1"
+ android:text=""
+ android:hint="澶у崕"
+ android:textColorHint="@color/colorText_b"
android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"
/>
@@ -51,25 +72,152 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
<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鍦板潃"/>
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="IP"
+ />
<EditText
- android:id="@+id/fragment_check_in_right_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="@dimen/h15dp"
android:layout_marginBottom="@dimen/h12dp"
- android:hint=""
+ android:text=""
+ android:hint="000.000.0.0"
android:textColorHint="@color/colorText_b"
android:textSize="@dimen/w14dp"
- android:textColor="@color/colorText_b"/>
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="绔彛"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="000.000.000.000"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鍒嗚鲸鐜�"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="704*480"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鐢ㄦ埛鍚�"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="admin"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="瀵嗙爜"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="********"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
index 76f7e44..0c8d5e4 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
@@ -26,24 +26,45 @@
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="鎽勫儚鏈�2璁剧疆"
+ android:text="鎽勫儚鏈�2"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
+ android:layout_marginBottom="@dimen/h25dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鎽勫儚鏈哄搧鐗�"
/>
<EditText
android:id="@+id/fragment_check_in_right_visitor_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="@dimen/h15dp"
android:layout_marginBottom="@dimen/h12dp"
- android:text="鎽勫儚澶�2"
+ android:text=""
+ android:hint="娴峰悍"
+ android:textColorHint="@color/colorText_b"
android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"
/>
@@ -51,25 +72,152 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
<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鍦板潃"/>
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="IP"
+ />
<EditText
- android:id="@+id/fragment_check_in_right_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="@dimen/h15dp"
android:layout_marginBottom="@dimen/h12dp"
- android:hint=""
+ android:text=""
+ android:hint="000.000.0.0"
android:textColorHint="@color/colorText_b"
android:textSize="@dimen/w14dp"
- android:textColor="@color/colorText_b"/>
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="绔彛"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="000.000.000.000"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鍒嗚鲸鐜�"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="704*480"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鐢ㄦ埛鍚�"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="admin"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="瀵嗙爜"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="********"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
index 9a49e12..d047428 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
@@ -48,119 +48,118 @@
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="@dimen/h13dp"
- android:paddingBottom="@dimen/h13dp"
- android:gravity="center_horizontal"
- android:layout_width="match_parent"
+ 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: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/w20dp"
- android:text="鏈夌嚎缃戠粶璁剧疆"
- 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:textColor="@color/colorPrimary"
+ android:textStyle="bold"
+ android:textSize="@dimen/w16dp"
+ android:text="鏈夌嚎缃戠粶璁剧疆"
+ android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
+ android:layout_marginBottom="@dimen/h25dp"
+ />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
- android:background="@color/colorText_b"
- android:layout_marginLeft="@dimen/w5dp"/>
+ android:background="@color/colorText_b"/>
</LinearLayout>
<LinearLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <LinearLayout
- android:paddingTop="@dimen/h13dp"
- android:gravity="center_horizontal"
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鏈嶅姟鍣↖P"
+ />
+ <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/w16dp"
- 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="@dimen/h13dp"
- android:paddingBottom="@dimen/h13dp"
- 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/w16dp"
- 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="@dimen/w10dp"
- 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_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="192.168.2.1"
+ 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="@dimen/w5dp"/>
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="鏈嶅姟鍣ㄧ鍙�"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="255.255.255.255"
+ 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"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="@dimen/w611dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h10dp"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textStyle="bold"
+ android:layout_marginTop="@dimen/h15dp"
+ android:textSize="@dimen/w14dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:text="閫氳"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="TCP"
+ android:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ android:textColor="@color/colorText_b"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_size_1"
+ android:background="@color/colorText_b"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0