From 54ee6e00def90552c41588c74f436fd0d181eae3 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 02 五月 2017 18:09:01 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 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 8f923c9..9ef0f39 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
@@ -5,10 +5,10 @@
<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"
/>
@@ -21,10 +21,10 @@
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"
@@ -41,7 +41,7 @@
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"
android:background="@color/colorBackground"
- android:padding="22dp"
+ android:padding="@dimen/w22dp"
android:text="@string/device_set"/>
<RelativeLayout
@@ -54,23 +54,23 @@
<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:textColor="@color/colorText_5"/>
@@ -85,22 +85,22 @@
<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:textColor="@color/colorText_5"/>
@@ -122,22 +122,22 @@
<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:textColor="@color/colorText_5"/>
@@ -146,7 +146,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorText_b"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
/>
</RelativeLayout>
<TextView
@@ -166,22 +166,22 @@
<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/u233"
- android:drawablePadding="20dp"
+ android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
@@ -196,22 +196,22 @@
<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/w20dp"
+ android:layout_marginRight="@dimen/w20dp"
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:textColor="@color/colorText_5"/>
@@ -220,14 +220,14 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorText_b"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorText_b"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
/>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0