development-history/proxy.git

parent: 15d0c49e | 补丁 | 提交 | ignore whitespace

xuxiuxi

2017-05-04 d3ea1a0c02ec5502672b0ad9bc9a7cdaeeba69de



git-svn-id: http://192.168.1.226/svn/proxy@601 454eff88-639b-444f-9e54-f578c98de674

3个文件已修改

	VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml	172 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml	172 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml	201 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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"


 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"


 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="服务器IP"

                        />

                    <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>

			@@ -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"

			@@ -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="服务器IP"
			/>
			<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>