xuxiuxi

2017-05-05 9f1f3656799fdbefa1cd46f45b86e0f8dcea4316

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

 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml

@@ -40,7 +40,6 @@
                    android:background="@drawable/u208"

                    android:text=""/>

            </LinearLayout>



            <ScrollView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

@@ -55,7 +54,9 @@
                        android:layout_width="@dimen/w611dp"

                        android:layout_height="wrap_content"

                        android:layout_marginTop="@dimen/h20dp"

                        android:orientation="vertical">

                    android:orientation="vertical"

                    android:layout_marginRight="@dimen/w10dp"

                    >

                        <TextView

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

@@ -86,14 +87,14 @@
                            android:layout_marginBottom="@dimen/h6dp"

                            android:text="摄像机品牌"

                            />

                        <LinearLayout

                    <RelativeLayout

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:orientation="horizontal"

                            >

                            <EditText

                                android:id="@+id/fragment_device_right_camera1_brand"

                                android:layout_width="@dimen/w580dp"

                            android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:background="@null"

                                android:layout_marginBottom="@dimen/h12dp"

@@ -109,13 +110,10 @@
                                android:layout_height="wrap_content"

                                android:background="@drawable/u51"

                                android:id="@+id/fragment_device_right_camera1_brand_more"

                            android:layout_marginRight="@dimen/w15dp"

                            android:layout_alignParentRight="true"

                                />

                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:text=" "

                            />

                        </LinearLayout>

                    </RelativeLayout>

                        <View

                            android:layout_width="match_parent"

                            android:layout_height="@dimen/view_size_1"

@@ -143,6 +141,8 @@
                            android:layout_marginBottom="@dimen/h12dp"

                            android:text=""

                            android:hint="000.000.0.0"

                        android:inputType="number"

                        android:digits="0123456789."

                            android:textColorHint="@color/colorText_b"

                            android:textSize="@dimen/w14dp"

                            android:textColor="@color/colorText_b"

@@ -173,7 +173,9 @@
                            android:background="@null"

                            android:layout_marginBottom="@dimen/h12dp"

                            android:text=""

                            android:hint="000.000.000.000"

                        android:hint="000"

                        android:inputType="number"

                        android:digits="0123456789"

                            android:textSize="@dimen/w14dp"

                            android:textColorHint="@color/colorText_b"

                            android:textColor="@color/colorText_b"

@@ -197,14 +199,14 @@
                            android:layout_marginBottom="@dimen/h6dp"

                            android:text="分辨率"

                            />

                        <LinearLayout

                    <RelativeLayout

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:orientation="horizontal"

                            >

                            <EditText

                                android:id="@+id/fragment_device_right_camera1_resolution"

                                android:layout_width="@dimen/w580dp"

                            android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:background="@null"

                                android:layout_marginBottom="@dimen/h12dp"

@@ -220,13 +222,10 @@
                                android:layout_height="wrap_content"

                                android:background="@drawable/u51"

                                android:id="@+id/fragment_device_right_camera1_resolution_more"

                            android:layout_marginRight="@dimen/w15dp"

                            android:layout_alignParentRight="true"

                                />

                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:text=" "

                                />

                        </LinearLayout>

                    </RelativeLayout>



                        <View

                            android:layout_width="match_parent"


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml

@@ -85,14 +85,14 @@
                        android:layout_marginBottom="@dimen/h6dp"

                        android:text="摄像机品牌"

                        />

                    <LinearLayout

                    <RelativeLayout

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:orientation="horizontal"

                        >

                        <EditText

                            android:id="@+id/fragment_device_right_camera2_brand"

                            android:layout_width="@dimen/w580dp"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:background="@null"

                            android:layout_marginBottom="@dimen/h12dp"

@@ -108,13 +108,10 @@
                            android:layout_height="wrap_content"

                            android:background="@drawable/u51"

                            android:id="@+id/fragment_device_right_camera2_brand_more"

                            android:layout_marginRight="@dimen/w15dp"

                            android:layout_alignParentRight="true"

                            />

                        <TextView

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:text=" "

                            />

                    </LinearLayout>

                    </RelativeLayout>

                    <View

                        android:layout_width="match_parent"

                        android:layout_height="@dimen/view_size_1"

@@ -142,6 +139,8 @@
                        android:layout_marginBottom="@dimen/h12dp"

                        android:text=""

                        android:hint="000.000.0.0"

                        android:inputType="number"

                        android:digits="0123456789."

                        android:textColorHint="@color/colorText_b"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"

@@ -172,7 +171,9 @@
                        android:background="@null"

                        android:layout_marginBottom="@dimen/h12dp"

                        android:text=""

                        android:hint="000.000.000.000"

                        android:hint="000"

                        android:inputType="number"

                        android:digits="0123456789"

                        android:textSize="@dimen/w14dp"

                        android:textColorHint="@color/colorText_b"

                        android:textColor="@color/colorText_b"

@@ -196,7 +197,7 @@
                        android:layout_marginBottom="@dimen/h6dp"

                        android:text="分辨率"

                        />

                    <LinearLayout

                    <RelativeLayout

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:orientation="horizontal"

@@ -219,13 +220,10 @@
                            android:layout_height="wrap_content"

                            android:background="@drawable/u51"

                            android:id="@+id/fragment_device_right_camera2_resolution_more"

                            android:layout_marginRight="@dimen/w15dp"

                            android:layout_alignParentRight="true"

                            />

                        <TextView

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:text=" "

                            />

                    </LinearLayout>

                    </RelativeLayout>



                    <View

                        android:layout_width="match_parent"


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml

@@ -90,6 +90,8 @@
                        android:layout_marginBottom="@dimen/h12dp"

                        android:text=""

                        android:hint="192.168.2.1"

                        android:inputType="number"

                        android:digits="0123456789."

                        android:textColorHint="@color/colorText_b"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"

@@ -121,6 +123,8 @@
                        android:layout_marginBottom="@dimen/h12dp"

                        android:text=""

                        android:hint="255.255.255.255"

                        android:inputType="number"

                        android:digits="0123456789"

                        android:textColorHint="@color/colorText_b"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"

@@ -144,7 +148,7 @@
                        android:layout_marginBottom="@dimen/h6dp"

                        android:text="通讯"

                        />

                    <LinearLayout

                    <RelativeLayout

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:orientation="horizontal"

@@ -167,13 +171,10 @@
                            android:layout_height="wrap_content"

                            android:background="@drawable/u51"

                            android:id="@+id/fragment_device_right_lan_protocol_more"

                            android:layout_marginRight="@dimen/w15dp"

                            android:layout_alignParentRight="true"

                            />

                        <TextView

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:text=" "

                            />

                    </LinearLayout>

                    </RelativeLayout>

                    <View

                        android:layout_width="match_parent"

                        android:layout_height="@dimen/view_size_1"