From 41bc5a329c73e3b43695f73f11c47c97c44cc1b6 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 09:45:41 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 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..3240f98 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"
@@ -103,18 +103,22 @@
android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"
/>
+ <TextView
+ android:layout_width="@dimen/w80dp"
+ android:layout_height="match_parent"
+ android:text=""
+ android:layout_alignParentRight="true"
+ android:id="@+id/fragment_device_right_camera1_resolution_more1"
+ />
<ImageView
android:layout_width="wrap_content"
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 +146,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 +178,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 +204,7 @@
android:layout_marginBottom="@dimen/h6dp"
android:text="鍒嗚鲸鐜�"
/>
- <LinearLayout
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -214,18 +222,22 @@
android:textColor="@color/colorText_b"
android:editable="false"
/>
+ <TextView
+ android:layout_width="@dimen/w80dp"
+ android:layout_height="match_parent"
+ android:text=""
+ android:layout_alignParentRight="true"
+ android:id="@+id/fragment_device_right_camera1_resolution_more"
+ />
<ImageView
android:layout_width="wrap_content"
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 +298,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