From c28371cf0a7e9e1de06d030d9033eb97e925c579 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 14:58:23 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 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 d2658fe..0b48827 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
@@ -40,6 +40,7 @@
android:background="@drawable/u208"
android:text=""/>
</LinearLayout>
+
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -85,18 +86,36 @@
android:layout_marginBottom="@dimen/h6dp"
android:text="鎽勫儚鏈哄搧鐗�"
/>
- <EditText
- android:id="@+id/fragment_device_right_camera1_brand"
+ <LinearLayout
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="@dimen/w580dp"
+ 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"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=" "
/>
+ </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
@@ -178,18 +197,37 @@
android:layout_marginBottom="@dimen/h6dp"
android:text="鍒嗚鲸鐜�"
/>
- <EditText
- android:id="@+id/fragment_device_right_camera1_resolution"
+ <LinearLayout
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="@dimen/w580dp"
+ 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"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=" "
+ />
+ </LinearLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
--
Gitblit v1.8.0