From 9f1f3656799fdbefa1cd46f45b86e0f8dcea4316 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 16:44:22 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 30 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 571 +++++++++++++++++++++++++--------------------------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml | 15
3 files changed, 307 insertions(+), 309 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 0b48827..d3ae240 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
@@ -2,300 +2,299 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_horizontal"
- android:orientation="vertical">
+ android:layout_height="@dimen/h76dp"
+ android:gravity="right|center_vertical"
+ android:orientation="horizontal">
+ <TextView
+ android:id="@+id/fragment_device_right_camera1_delete"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
+ android:gravity="center"
+ android:textColor="@android:color/white"
+ android:background="@drawable/u194"
+ android:text=""/>
+ <TextView
+ android:id="@+id/fragment_device_right_camera1_add"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
+ android:gravity="center"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:textColor="@android:color/white"
+ android:background="@drawable/u249"
+ android:text=""/>
+ <TextView
+ android:id="@+id/fragment_device_right_camera1_save"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
+ android:gravity="center"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:layout_marginRight="@dimen/w10dp"
+ android:textColor="@android:color/white"
+ android:background="@drawable/u208"
+ android:text=""/>
+ </LinearLayout>
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/h76dp"
- android:gravity="right|center_vertical"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/fragment_device_right_camera1_delete"
- android:layout_width="@dimen/w40dp"
- android:layout_height="@dimen/h36dp"
- android:gravity="center"
- android:textColor="@android:color/white"
- android:background="@drawable/u194"
- android:text=""/>
- <TextView
- android:id="@+id/fragment_device_right_camera1_add"
- android:layout_width="@dimen/w40dp"
- android:layout_height="@dimen/h36dp"
- android:gravity="center"
- android:layout_marginLeft="@dimen/w10dp"
- android:textColor="@android:color/white"
- android:background="@drawable/u249"
- android:text=""/>
- <TextView
- android:id="@+id/fragment_device_right_camera1_save"
- android:layout_width="@dimen/w40dp"
- android:layout_height="@dimen/h36dp"
- android:gravity="center"
- android:layout_marginLeft="@dimen/w10dp"
- android:layout_marginRight="@dimen/w10dp"
- android:textColor="@android:color/white"
- android:background="@drawable/u208"
- android:text=""/>
- </LinearLayout>
-
- <ScrollView
- android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
>
<LinearLayout
- android:orientation="vertical"
- android:layout_width="@dimen/w596dp"
+ android:layout_width="@dimen/w611dp"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
+ android:layout_marginTop="@dimen/h20dp"
+ android:orientation="vertical"
+ android:layout_marginRight="@dimen/w10dp"
>
- <LinearLayout
- android:layout_width="@dimen/w611dp"
+ <TextView
+ android:layout_width="wrap_content"
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: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"
- android:layout_height="wrap_content"
- android:textStyle="bold"
- android:layout_marginTop="@dimen/h10dp"
- android:textSize="@dimen/w14dp"
- android:layout_marginBottom="@dimen/h6dp"
- android:text="鎽勫儚鏈哄搧鐗�"
- />
- <LinearLayout
- 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_height="wrap_content"
- android:background="@null"
- android:layout_marginBottom="@dimen/h12dp"
- android:text=""
- android:hint="澶у崕"
- android:editable="false"
- android:textColorHint="@color/colorText_b"
- android:textSize="@dimen/w14dp"
- 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_camera1_brand_more"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=" "
- />
- </LinearLayout>
- <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: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: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: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="鍒嗚鲸鐜�"
- />
- <LinearLayout
- 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_height="wrap_content"
- android:background="@null"
- android:layout_marginBottom="@dimen/h12dp"
- android:text=""
- android:hint="704*480"
- 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_camera1_resolution_more"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text=" "
- />
- </LinearLayout>
-
- <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: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: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_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>
+ 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>
- </ScrollView>
- </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_camera1_brand"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="澶у崕"
+ android:editable="false"
+ android:textColorHint="@color/colorText_b"
+ android:textSize="@dimen/w14dp"
+ 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_camera1_brand_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
+ 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:layout_height="wrap_content"
+ android:background="@null"
+ 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"
+ />
+ <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: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"
+ android:inputType="number"
+ android:digits="0123456789"
+ 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="鍒嗚鲸鐜�"
+ />
+ <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="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:hint="704*480"
+ 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_camera1_resolution_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
+ 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_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: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_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>
+ </ScrollView>
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
index 0603511..00e9787 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
+++ b/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"
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 cb20c99..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
@@ -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"
--
Gitblit v1.8.0