From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml |  226 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 122 insertions(+), 104 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
index 3d0f1f1..ba20b17 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
@@ -16,7 +16,7 @@
                 android:gravity="right|center_vertical"
                 android:orientation="horizontal">
                 <TextView
-                    android:id="@+id/fragment_device_right_delete"
+                    android:id="@+id/fragment_device_right_lan_delete"
                     android:layout_width="@dimen/w40dp"
                     android:layout_height="@dimen/h36dp"
                     android:gravity="center"
@@ -24,7 +24,7 @@
                     android:background="@drawable/u194"
                     android:text=""/>
                 <TextView
-                    android:id="@+id/fragment_device_right_add"
+                    android:id="@+id/fragment_device_right_lan_add"
                     android:layout_width="@dimen/w40dp"
                     android:layout_height="@dimen/h36dp"
                     android:gravity="center"
@@ -33,7 +33,7 @@
                     android:background="@drawable/u249"
                     android:text=""/>
                 <TextView
-                    android:id="@+id/fragment_device_right_save"
+                    android:id="@+id/fragment_device_right_lan_save"
                     android:layout_width="@dimen/w40dp"
                     android:layout_height="@dimen/h36dp"
                     android:gravity="center"
@@ -49,118 +49,136 @@
                 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/text_size_navigation"
-                                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:layout_marginBottom="@dimen/h20dp"
+                        />
                     <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/h10dp"
+                        android:textSize="@dimen/w14dp"
+                        android:layout_marginBottom="@dimen/h6dp"
+                        android:text="鏈嶅姟鍣↖P"
+                        />
+                    <EditText
+                        android:id="@+id/fragment_device_right_lan_ip"
                         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/text_size_big"
-                                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/text_size_big"
-                                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:inputType="number"
+                        android:digits="0123456789."
+                        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/h10dp"
+                        android:textSize="@dimen/w14dp"
+                        android:layout_marginBottom="@dimen/h6dp"
+                        android:text="鏈嶅姟鍣ㄧ鍙�"
+                        />
+                    <EditText
+                        android:id="@+id/fragment_device_right_lan_port"
+                        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:inputType="number"
+                        android:digits="0123456789"
+                        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="閫氳"
+                        />
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        >
+                        <EditText
+                            android:id="@+id/fragment_device_right_lan_protocol"
+                            android:layout_width="@dimen/w580dp"
+                            android:layout_height="wrap_content"
+                            android:background="@null"
+                            android:layout_marginBottom="@dimen/h12dp"
+                            android:text=""
+                            android:hint="TCP"
+                            android:editable="false"
+                            android:textSize="@dimen/w14dp"
+                            android:textColorHint="@color/colorText_b"
+                            android:textColor="@color/colorText_b"
+                            />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            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"
+                            />
+                    </RelativeLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/view_size_1"
+                        android:background="@color/colorText_b"/>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>

--
Gitblit v1.8.0