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_camera2.xml | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
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..287d1d7 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"
@@ -286,6 +284,7 @@
android:text=""
android:hint="********"
android:textSize="@dimen/w14dp"
+ android:inputType="textPassword"
android:textColorHint="@color/colorText_b"
android:textColor="@color/colorText_b"
/>
--
Gitblit v1.8.0