From 3839ef806215a981ef9b2e83dafaab5e1d694764 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 16:22:31 +0800
Subject: [PATCH] detect only develop finished
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 199 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 172 insertions(+), 27 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
index 8591fe4..36deecc 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
- android:id="@+id/device_manager_back"
+ android:id="@+id/fragment_device_back"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:text="< 璁惧绠＄悊"
@@ -18,7 +18,7 @@
android:background="@color/colorSearch"
android:orientation="vertical">
<EditText
- android:id="@+id/visitor_manager_search_et"
+ android:id="@+id/fragment_device_left_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5.5dp"
@@ -43,22 +43,109 @@
android:background="@color/colorBackground"
android:padding="22dp"
android:text="@string/device_set"/>
- <include
- android:id="@+id/device_wifi"
- layout="@layout/fragment_device_left_row"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
- <include
- android:id="@+id/device_landline"
- layout="@layout/fragment_device_left_row"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
- <include
- android:id="@+id/device_school"
- layout="@layout/fragment_device_left_row"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ <RelativeLayout
+ android:background="@android:color/white"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <CheckBox
+ android:id="@+id/fragment_device_left_wifi_check_box"
+ android:layout_centerVertical="true"
+ android:clickable="false"
+ android:layout_marginLeft="24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:orientation="vertical"
+ android:layout_marginLeft="30dp"
+ android:layout_marginRight="30dp"
+ android:layout_toRightOf="@id/fragment_device_left_wifi_check_box">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="鏃犵嚎WIFI璁剧疆"
+ android:drawableLeft="@mipmap/ic_launcher"
+ android:drawablePadding="20dp"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/text_size_big"
+ android:textColor="@color/colorText_5"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ </RelativeLayout>
+ <RelativeLayout
+ android:background="@android:color/white"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <CheckBox
+ android:id="@+id/fragment_device_left_lan_check_box"
+ android:layout_centerVertical="true"
+ android:clickable="false"
+ android:layout_marginLeft="24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:orientation="vertical"
+ android:layout_marginLeft="30dp"
+ android:layout_marginRight="30dp"
+ android:layout_toRightOf="@id/fragment_device_left_lan_check_box">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="鏈夌嚎缃戠粶璁剧疆"
+ android:drawableLeft="@mipmap/ic_launcher"
+ android:drawablePadding="20dp"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/text_size_big"
+ android:textColor="@color/colorText_5"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ </RelativeLayout>
+ <RelativeLayout
+ android:background="@android:color/white"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <CheckBox
+ android:id="@+id/fragment_device_left_school_check_box"
+ android:layout_centerVertical="true"
+ android:clickable="false"
+ android:layout_marginLeft="24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:orientation="vertical"
+ android:layout_marginLeft="30dp"
+ android:layout_marginRight="30dp"
+ android:layout_toRightOf="@id/fragment_device_left_school_check_box">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="鎵�灞炲鏍¤缃�"
+ android:drawableLeft="@mipmap/ic_launcher"
+ android:drawablePadding="20dp"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/text_size_big"
+ android:textColor="@color/colorText_5"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ </RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -67,16 +154,74 @@
android:background="@color/colorBackground"
android:padding="22dp"
android:text="@string/device_camera"/>
- <include
- android:id="@+id/device_camera1"
- layout="@layout/fragment_device_left_row"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
- <include
- android:id="@+id/device_camera2"
- layout="@layout/fragment_device_left_row"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ <RelativeLayout
+ android:background="@android:color/white"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <CheckBox
+ android:id="@+id/fragment_device_left_camera1_check_box"
+ android:layout_centerVertical="true"
+ android:clickable="false"
+ android:layout_marginLeft="24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:orientation="vertical"
+ android:layout_marginLeft="30dp"
+ android:layout_marginRight="30dp"
+ android:layout_toRightOf="@id/fragment_device_left_camera1_check_box">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="鎽勫儚鏈�1"
+ android:drawableLeft="@mipmap/ic_launcher"
+ android:drawablePadding="20dp"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/text_size_big"
+ android:textColor="@color/colorText_5"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ </RelativeLayout>
+ <RelativeLayout
+ android:background="@android:color/white"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <CheckBox
+ android:id="@+id/fragment_device_left_camera2_check_box"
+ android:layout_centerVertical="true"
+ android:clickable="false"
+ android:layout_marginLeft="24dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:orientation="vertical"
+ android:layout_marginLeft="30dp"
+ android:layout_marginRight="30dp"
+ android:layout_toRightOf="@id/fragment_device_left_camera2_check_box">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="鎽勫儚鏈�2"
+ android:drawableLeft="@mipmap/ic_launcher"
+ android:drawablePadding="20dp"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/text_size_big"
+ android:textColor="@color/colorText_5"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"/>
+ </LinearLayout>
+ </RelativeLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0