From 0fb71a3ade434e50dce77d31c42059cf5f973af9 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 12:56:14 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml |  398 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 202 insertions(+), 196 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 460aa87..d2658fe 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
@@ -13,7 +13,7 @@
                 android:gravity="right|center_vertical"
                 android:orientation="horizontal">
                 <TextView
-                    android:id="@+id/fragment_device_right_delete"
+                    android:id="@+id/fragment_device_right_camera1_delete"
                     android:layout_width="@dimen/w40dp"
                     android:layout_height="@dimen/h36dp"
                     android:gravity="center"
@@ -21,7 +21,7 @@
                     android:background="@drawable/u194"
                     android:text=""/>
                 <TextView
-                    android:id="@+id/fragment_device_right_add"
+                    android:id="@+id/fragment_device_right_camera1_add"
                     android:layout_width="@dimen/w40dp"
                     android:layout_height="@dimen/h36dp"
                     android:gravity="center"
@@ -30,7 +30,7 @@
                     android:background="@drawable/u249"
                     android:text=""/>
                 <TextView
-                    android:id="@+id/fragment_device_right_save"
+                    android:id="@+id/fragment_device_right_camera1_save"
                     android:layout_width="@dimen/w40dp"
                     android:layout_height="@dimen/h36dp"
                     android:gravity="center"
@@ -42,216 +42,222 @@
             </LinearLayout>
             <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="@dimen/w596dp"
                 android:layout_height="wrap_content"
                 >
                 <LinearLayout
-                    android:layout_width="@dimen/w611dp"
+                    android:orientation="vertical"
+                    android:layout_width="@dimen/w596dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/h20dp"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    >
+                    <LinearLayout
+                        android:layout_width="@dimen/w611dp"
                         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"
-                        android:layout_marginBottom="@dimen/h20dp"
-                        />
-                    <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">
+                        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"
+                            android:layout_marginBottom="@dimen/h20dp"
+                            />
+                        <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"
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            android:layout_marginTop="@dimen/h10dp"
+                            android:textSize="@dimen/w14dp"
+                            android:layout_marginBottom="@dimen/h6dp"
+                            android:text="鎽勫儚鏈哄搧鐗�"
+                            />
+                        <EditText
+                            android:id="@+id/fragment_device_right_camera1_brand"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="@null"
+                            android:layout_marginBottom="@dimen/h12dp"
+                            android:text=""
+                            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"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="@dimen/w611dp"
                         android:layout_height="wrap_content"
-                        android:textStyle="bold"
                         android:layout_marginTop="@dimen/h10dp"
-                        android:textSize="@dimen/w14dp"
-                        android:layout_marginBottom="@dimen/h6dp"
-                        android:text="鎽勫儚鏈哄搧鐗�"
-                        />
-                    <EditText
-                        android:id="@+id/fragment_device_right_camera1_brand"
-                        android:layout_width="match_parent"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            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"
+                            android:layout_marginBottom="@dimen/h12dp"
+                            android:text=""
+                            android:hint="000.000.0.0"
+                            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:background="@null"
-                        android:layout_marginBottom="@dimen/h12dp"
-                        android:text=""
-                        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"/>
-                </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/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:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            android:layout_marginTop="@dimen/h10dp"
+                            android:textSize="@dimen/w14dp"
+                            android:layout_marginBottom="@dimen/h6dp"
+                            android:text="绔彛"
+                            />
+                        <EditText
+                            android:id="@+id/fragment_device_right_camera1_port"
+                            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:background="@null"
-                        android:layout_marginBottom="@dimen/h12dp"
-                        android:text=""
-                        android:hint="000.000.0.0"
-                        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/h10dp"
-                        android:textSize="@dimen/w14dp"
-                        android:layout_marginBottom="@dimen/h6dp"
-                        android:text="绔彛"
-                        />
-                    <EditText
-                        android:layout_width="match_parent"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            android:layout_marginTop="@dimen/h10dp"
+                            android:textSize="@dimen/w14dp"
+                            android:layout_marginBottom="@dimen/h6dp"
+                            android:text="鍒嗚鲸鐜�"
+                            />
+                        <EditText
+                            android:id="@+id/fragment_device_right_camera1_resolution"
+                            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: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/h10dp"
-                        android:textSize="@dimen/w14dp"
-                        android:layout_marginBottom="@dimen/h6dp"
-                        android:text="鍒嗚鲸鐜�"
-                        />
-                    <EditText
-                        android:layout_width="match_parent"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            android:layout_marginTop="@dimen/h10dp"
+                            android:textSize="@dimen/w14dp"
+                            android:layout_marginBottom="@dimen/h6dp"
+                            android:text="鐢ㄦ埛鍚�"
+                            />
+                        <EditText
+                            android:id="@+id/fragment_device_right_camera1_username"
+                            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: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/h10dp"
-                        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"/>
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textStyle="bold"
+                            android:layout_marginTop="@dimen/h10dp"
+                            android:textSize="@dimen/w14dp"
+                            android:layout_marginBottom="@dimen/h6dp"
+                            android:text="瀵嗙爜"
+                            />
+                        <EditText
+                            android:id="@+id/fragment_device_right_camera1_password"
+                            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"
+                            android:background="@color/colorText_b"/>
+                    </LinearLayout>
                 </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/h10dp"
-                        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"
-                        android:background="@color/colorText_b"/>
-                </LinearLayout>
-            </LinearLayout>
             </ScrollView>
         </LinearLayout>
 </LinearLayout>
\ No newline at end of file

--
Gitblit v1.8.0