From 0fb71a3ade434e50dce77d31c42059cf5f973af9 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 12:56:14 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 89 ++++++++++++++++++++++++--------------------
1 files changed, 48 insertions(+), 41 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 483070e..1bb17ba 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
@@ -2,51 +2,53 @@
<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>
+ android:layout_height="@dimen/h76dp"
+ android:gravity="right|center_vertical"
+ android:orientation="horizontal">
+ <TextView
+ android:id="@+id/fragment_device_right_camera2_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_camera2_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_camera2_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"
@@ -84,7 +86,7 @@
android:text="鎽勫儚鏈哄搧鐗�"
/>
<EditText
- android:id="@+id/fragment_check_in_right_visitor_reason"
+ android:id="@+id/fragment_device_right_camera2_brand"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -115,6 +117,7 @@
android:text="IP"
/>
<EditText
+ android:id="@+id/fragment_device_right_camera2_ip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -145,6 +148,7 @@
android:text="绔彛"
/>
<EditText
+ android:id="@+id/fragment_device_right_camera2_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -175,6 +179,7 @@
android:text="鍒嗚鲸鐜�"
/>
<EditText
+ android:id="@+id/fragment_device_right_camera2_resolution"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -205,6 +210,7 @@
android:text="鐢ㄦ埛鍚�"
/>
<EditText
+ android:id="@+id/fragment_device_right_camera2_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -235,6 +241,7 @@
android:text="瀵嗙爜"
/>
<EditText
+ android:id="@+id/fragment_device_right_camera2_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
@@ -251,6 +258,6 @@
android:background="@color/colorText_b"/>
</LinearLayout>
</LinearLayout>
- </LinearLayout>
- </ScrollView>
+ </ScrollView>
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0