From bf63e9396cde256efe8592c20f7d307e3a6a3221 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 16:23:37 +0800
Subject: [PATCH] add lic
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 169 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 93 insertions(+), 76 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 ae3ee08..b3c350c 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
@@ -1,35 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:id="@+id/fragment_check_in_left_parent"
+ >
<TextView
android:id="@+id/fragment_device_back"
android:layout_width="wrap_content"
- android:layout_height="30dp"
+ android:layout_height="@dimen/h30dp"
android:text="< 璁惧绠＄悊"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="10dp"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:layout_marginTop="@dimen/h10dp"
android:layout_centerVertical="true"
android:textColor="#8BD2F6"
+ android:textSize="@dimen/w14dp"
/>
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorSearch"
- android:orientation="vertical">
- <EditText
+ android:orientation="vertical"
+ >
+ <cn.com.basic.face.widget.checkin.SearchEditText
android:id="@+id/fragment_device_left_search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5.5dp"
- android:layout_marginBottom="5.5dp"
- android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
+ android:layout_marginTop="@dimen/h6dp"
+ android:layout_marginBottom="@dimen/h6dp"
+ android:layout_marginLeft="@dimen/w4dp"
+ android:layout_marginRight="@dimen/w4dp"
android:gravity="center"
android:hint="Search"
android:textColorHint="@color/colorSearch"
- android:background="@drawable/visitor_register_search_et"/>
+ android:background="@drawable/visitor_register_search_et"
+ android:textSize="@dimen/w14dp"/>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -39,185 +44,197 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"
android:background="@color/colorBackground"
- android:padding="22dp"
+ android:padding="@dimen/w22dp"
android:text="@string/device_set"/>
<RelativeLayout
android:background="@android:color/white"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:id="@+id/fragment_device_left_wifi_relative_layout"
+ >
<RadioButton
android:id="@+id/fragment_device_left_wifi_check_box"
android:layout_centerVertical="true"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
+ android:clickable="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="@dimen/h56dp"
android:orientation="vertical"
- android:layout_marginLeft="30dp"
- android:layout_marginRight="30dp"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w30dp"
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="@drawable/u216"
- android:drawablePadding="20dp"
+ android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
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">
-
+ android:layout_height="wrap_content"
+ android:id="@+id/fragment_device_left_lan_relative_layout"
+ >
<RadioButton
android:id="@+id/fragment_device_left_lan_check_box"
android:layout_centerVertical="true"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="@dimen/h56dp"
android:orientation="vertical"
- android:layout_marginLeft="30dp"
- android:layout_marginRight="30dp"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w30dp"
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="@drawable/u222"
- android:drawablePadding="20dp"
+ android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
+
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="@dimen/w24dp"
+ />
</RelativeLayout>
<RelativeLayout
android:background="@android:color/white"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
+ android:layout_height="wrap_content"
+ android:id="@+id/fragment_device_left_school_relative_layout"
+ >
<RadioButton
android:id="@+id/fragment_device_left_school_check_box"
android:layout_centerVertical="true"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="@dimen/h56dp"
android:orientation="vertical"
- android:layout_marginLeft="30dp"
- android:layout_marginRight="30dp"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w30dp"
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="@drawable/u325"
- android:drawablePadding="20dp"
+ android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="@dimen/w24dp"
+ />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"
android:background="@color/colorBackground"
- android:padding="22dp"
+ android:padding="@dimen/w22dp"
android:text="@string/device_camera"/>
<RelativeLayout
android:background="@android:color/white"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
+ android:layout_height="wrap_content"
+ android:id="@+id/fragment_device_left_camera1_relative_layout"
+ >
<RadioButton
android:id="@+id/fragment_device_left_camera1_check_box"
android:layout_centerVertical="true"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="@dimen/h56dp"
android:orientation="vertical"
- android:layout_marginLeft="30dp"
- android:layout_marginRight="30dp"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w30dp"
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="@drawable/u251"
- android:drawablePadding="20dp"
+ android:drawableLeft="@drawable/u233"
+ android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
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">
-
+ android:layout_height="wrap_content"
+ android:id="@+id/fragment_device_left_camera2_relative_layout"
+ >
<RadioButton
android:id="@+id/fragment_device_left_camera2_check_box"
android:layout_centerVertical="true"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="@dimen/h56dp"
android:orientation="vertical"
- android:layout_marginLeft="30dp"
- android:layout_marginRight="30dp"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w30dp"
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="@drawable/u233"
- android:drawablePadding="20dp"
+ android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="@dimen/w24dp"
+ />
</RelativeLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="@dimen/w24dp"
+ />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0