From d289fd8eb7a6581da0dd9c9963c15b6e7c08d744 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 27 六月 2017 09:48:34 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 92 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 21 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 1bb17ba..7378e5f 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,18 +85,40 @@
android:layout_marginBottom="@dimen/h6dp"
android:text="鎽勫儚鏈哄搧鐗�"
/>
- <EditText
- android:id="@+id/fragment_device_right_camera2_brand"
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@null"
- android:layout_marginBottom="@dimen/h12dp"
- android:text=""
- android:hint="娴峰悍"
- android:textColorHint="@color/colorText_b"
- android:textSize="@dimen/w14dp"
- android:textColor="@color/colorText_b"
- />
+ android:orientation="horizontal"
+ >
+ <EditText
+ android:id="@+id/fragment_device_right_camera2_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"
+ />
+ <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_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"
@@ -124,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"
@@ -154,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"
@@ -178,18 +204,41 @@
android:layout_marginBottom="@dimen/h6dp"
android:text="鍒嗚鲸鐜�"
/>
- <EditText
- android:id="@+id/fragment_device_right_camera2_resolution"
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@null"
- android:layout_marginBottom="@dimen/h12dp"
- android:text=""
- android:hint="704*480"
- android:textSize="@dimen/w14dp"
- android:textColorHint="@color/colorText_b"
- android:textColor="@color/colorText_b"
- />
+ android:orientation="horizontal"
+ >
+ <EditText
+ android:id="@+id/fragment_device_right_camera2_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:textSize="@dimen/w14dp"
+ android:textColorHint="@color/colorText_b"
+ 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"
+ />
+ </RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
@@ -249,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