xuxiuxi

2017-05-03 0cdd8b3321c7fe62c41a1f18c080739aa5b009fa

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

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

@@ -22,7 +22,9 @@
                        android:gravity="center"

                        android:textColor="@android:color/white"

                        android:background="@drawable/u321"

                        android:text=""/>

                        android:text=""

                        android:textSize="@dimen/w14dp"

                        />

                    <TextView

                        android:id="@+id/fragment_check_in_right_add"

                        android:layout_width="@dimen/w40dp"

@@ -31,7 +33,9 @@
                        android:layout_marginLeft="@dimen/w10dp"

                        android:textColor="@android:color/white"

                        android:background="@drawable/u249"

                        android:text=""/>

                        android:text=""

                        android:textSize="@dimen/w14dp"

                        />

                    <TextView

                        android:id="@+id/fragment_check_in_right_save"

                        android:layout_width="@dimen/w40dp"

@@ -41,7 +45,8 @@
                        android:layout_marginRight="@dimen/w10dp"

                        android:textColor="@android:color/white"

                        android:background="@drawable/u208"

                        android:text=""/>

                        android:text=""

                        android:textSize="@dimen/w14dp"/>

            </LinearLayout>

            <LinearLayout

                android:layout_width="wrap_content"


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

@@ -11,6 +11,7 @@
        android:layout_marginTop="@dimen/h10dp"

        android:layout_centerVertical="true"

        android:textColor="#8BD2F6"

        android:textSize="@dimen/w14dp"

        />

    <LinearLayout

        android:layout_width="match_parent"

@@ -28,7 +29,8 @@
            android:gravity="center"

            android:hint="Search"

            android:textColorHint="@color/colorSearch"

            android:background="@drawable/visitor_register_search_et"/>

            android:background="@drawable/visitor_register_search_et"

            android:textSize="@dimen/w14dp"/>

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

@@ -38,7 +40,7 @@
            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textSize="@dimen/text_size_big"

                android:textSize="@dimen/w16dp"

                android:textColor="@color/colorText_5"

                android:background="@color/colorBackground"

                android:padding="@dimen/w22dp"

@@ -72,7 +74,7 @@
                        android:drawableLeft="@drawable/u216"

                        android:drawablePadding="@dimen/w20dp"

                        android:gravity="center_vertical"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:textColor="@color/colorText_5"/>

                </LinearLayout>

            </RelativeLayout>

@@ -102,7 +104,7 @@
                        android:drawableLeft="@drawable/u222"

                        android:drawablePadding="@dimen/w20dp"

                        android:gravity="center_vertical"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:textColor="@color/colorText_5"/>



                </LinearLayout>

@@ -110,7 +112,7 @@
                    android:layout_width="match_parent"

                    android:layout_height="1dp"

                    android:background="@color/colorText_b"

                    android:layout_marginLeft="24dp"

                    android:layout_marginLeft="@dimen/w24dp"

                    />

            </RelativeLayout>

            <RelativeLayout

@@ -139,7 +141,7 @@
                        android:drawableLeft="@drawable/u325"

                        android:drawablePadding="@dimen/w20dp"

                        android:gravity="center_vertical"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:textColor="@color/colorText_5"/>

                </LinearLayout>

                <View

@@ -152,10 +154,10 @@
            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textSize="@dimen/text_size_big"

                android:textSize="@dimen/w16dp"

                android:textColor="@color/colorText_5"

                android:background="@color/colorBackground"

                android:padding="22dp"

                android:padding="@dimen/w22dp"

                android:text="@string/device_camera"/>

            <RelativeLayout

                android:background="@android:color/white"

@@ -183,7 +185,7 @@
                        android:drawableLeft="@drawable/u233"

                        android:drawablePadding="@dimen/w20dp"

                        android:gravity="center_vertical"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:textColor="@color/colorText_5"/>

                </LinearLayout>

            </RelativeLayout>

@@ -213,7 +215,7 @@
                        android:drawableLeft="@drawable/u233"

                        android:drawablePadding="@dimen/w20dp"

                        android:gravity="center_vertical"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:textColor="@color/colorText_5"/>

                </LinearLayout>

                <View


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

@@ -26,7 +26,7 @@
            android:drawableLeft="@mipmap/ic_launcher"

            android:drawablePadding="@dimen/w20dp"

            android:gravity="center_vertical"

            android:textSize="@dimen/text_size_big"

            android:textSize="@dimen/w16dp"

            android:textColor="@color/colorText_5"/>

        <View

            android:layout_width="match_parent"


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

@@ -68,11 +68,12 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_navigation"

                                android:textSize="@dimen/w20dp"

                                android:text="无线WIFI设置"

                                android:gravity="left"

                                android:layout_gravity="left"

                                android:textColor="@color/colorPrimary"/>

                                android:textColor="@color/colorPrimary"

                                />

                        </LinearLayout>

                        <Switch

                            android:layout_width="wrap_content"

@@ -106,7 +107,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_big"

                                android:textSize="@dimen/w16dp"

                                android:text="选择网络"

                                android:gravity="left"

                                android:layout_gravity="left"

@@ -135,7 +136,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_big"

                                android:textSize="@dimen/w16dp"

                                android:text="网络1"

                                android:gravity="left"

                                android:layout_gravity="left"


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

@@ -32,7 +32,7 @@
                        android:layout_height="wrap_content"

                        android:textColor="@color/colorPrimary"

                        android:textStyle="bold"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:text="摄像机1设置"

                        android:id="@+id/fragment_check_in_right_visitor_reason_text_view"

                        />

@@ -44,7 +44,7 @@
                        android:layout_marginTop="@dimen/h15dp"

                        android:layout_marginBottom="@dimen/h12dp"

                        android:text="摄像头1"

                        android:textSize="@dimen/text_size_normal"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"

                        />

                    <View

@@ -57,7 +57,7 @@
                        android:textColor="@color/colorPrimary"

                        android:textStyle="bold"

                        android:layout_marginTop="@dimen/h20dp"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:text="IP地址"/>

                    <EditText

                        android:id="@+id/fragment_check_in_right_remark"

@@ -68,7 +68,7 @@
                        android:layout_marginBottom="@dimen/h12dp"

                        android:hint=""

                        android:textColorHint="@color/colorText_b"

                        android:textSize="@dimen/text_size_normal"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"/>

                    <View

                        android:layout_width="match_parent"


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

@@ -32,7 +32,7 @@
                        android:layout_height="wrap_content"

                        android:textColor="@color/colorPrimary"

                        android:textStyle="bold"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:text="摄像机2设置"

                        android:id="@+id/fragment_check_in_right_visitor_reason_text_view"

                        />

@@ -44,7 +44,7 @@
                        android:layout_marginTop="@dimen/h15dp"

                        android:layout_marginBottom="@dimen/h12dp"

                        android:text="摄像头2"

                        android:textSize="@dimen/text_size_normal"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"

                        />

                    <View

@@ -57,7 +57,7 @@
                        android:textColor="@color/colorPrimary"

                        android:textStyle="bold"

                        android:layout_marginTop="@dimen/h20dp"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:text="IP地址"/>

                    <EditText

                        android:id="@+id/fragment_check_in_right_remark"

@@ -68,7 +68,7 @@
                        android:layout_marginBottom="@dimen/h12dp"

                        android:hint=""

                        android:textColorHint="@color/colorText_b"

                        android:textSize="@dimen/text_size_normal"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"/>

                    <View

                        android:layout_width="match_parent"


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

@@ -68,7 +68,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_navigation"

                                android:textSize="@dimen/w20dp"

                                android:text="有线网络设置"

                                android:gravity="left"

                                android:layout_gravity="left"

@@ -106,7 +106,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_big"

                                android:textSize="@dimen/w16dp"

                                android:text="选择网络"

                                android:gravity="left"

                                android:layout_gravity="left"

@@ -135,7 +135,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_big"

                                android:textSize="@dimen/w16dp"

                                android:text="网络1"

                                android:gravity="left"

                                android:layout_gravity="left"


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

@@ -32,7 +32,7 @@
                        android:layout_height="wrap_content"

                        android:textColor="@color/colorPrimary"

                        android:textStyle="bold"

                        android:textSize="@dimen/text_size_big"

                        android:textSize="@dimen/w16dp"

                        android:text="所有学校设置"

                        android:id="@+id/fragment_check_in_right_visitor_reason_text_view"

                        />

@@ -44,7 +44,7 @@
                        android:layout_marginTop="@dimen/h15dp"

                        android:layout_marginBottom="@dimen/h12dp"

                        android:text="朝阳小学"

                        android:textSize="@dimen/text_size_normal"

                        android:textSize="@dimen/w14dp"

                        android:textColor="@color/colorText_b"

                        />

                    <View


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

@@ -68,7 +68,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_navigation"

                                android:textSize="@dimen/w20dp"

                                android:text="无线WIFI设置"

                                android:gravity="left"

                                android:layout_gravity="left"

@@ -106,7 +106,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_big"

                                android:textSize="@dimen/w16dp"

                                android:text="选择网络"

                                android:gravity="left"

                                android:layout_gravity="left"

@@ -135,7 +135,7 @@
                            <TextView

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"

                                android:textSize="@dimen/text_size_big"

                                android:textSize="@dimen/w16dp"

                                android:text="网络1"

                                android:gravity="left"

                                android:layout_gravity="left"