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_camera1.xml | 170 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 105 insertions(+), 65 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 e0dd6b4..85804f6 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,60 +2,61 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
- <ScrollView
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="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">
- <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_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_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_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">
+ 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:orientation="vertical"
android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
>
<LinearLayout
android:layout_width="@dimen/w611dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/h20dp"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:layout_marginRight="@dimen/w10dp"
+ >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -86,18 +87,33 @@
android:layout_marginBottom="@dimen/h6dp"
android:text="鎽勫儚鏈哄搧鐗�"
/>
- <EditText
- android:id="@+id/fragment_device_right_camera1_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_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"
@@ -125,6 +141,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"
@@ -149,12 +167,15 @@
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:hint="000"
+ android:inputType="number"
+ android:digits="0123456789"
android:textSize="@dimen/w14dp"
android:textColorHint="@color/colorText_b"
android:textColor="@color/colorText_b"
@@ -178,17 +199,34 @@
android:layout_marginBottom="@dimen/h6dp"
android:text="鍒嗚鲸鐜�"
/>
- <EditText
+ <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_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"
@@ -209,6 +247,7 @@
android:text="鐢ㄦ埛鍚�"
/>
<EditText
+ android:id="@+id/fragment_device_right_camera1_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -239,12 +278,14 @@
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:inputType="textPassword"
android:textSize="@dimen/w14dp"
android:textColorHint="@color/colorText_b"
android:textColor="@color/colorText_b"
@@ -255,7 +296,6 @@
android:background="@color/colorText_b"/>
</LinearLayout>
</LinearLayout>
- </ScrollView>
- </LinearLayout>
- </ScrollView>
+ </ScrollView>
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0