From 0cdd8b3321c7fe62c41a1f18c080739aa5b009fa Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 12:10:06 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 8 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml | 6 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml | 2
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 8 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml | 9 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml | 6 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml | 11 ++++-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 22 ++++++-----
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml | 4 +-
9 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
index d02bdb2..79c473d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml
@@ -22,7 +22,9 @@
android:gravity="center"
android:textColor="@android:color/white"
android:background="@drawable/u321"
- android:text=""/>
+ android:text=""
+ android:textSize="@dimen/w14dp"
+ />
<TextView
android:id="@+id/fragment_check_in_right_add"
android:layout_width="@dimen/w40dp"
@@ -31,7 +33,9 @@
android:layout_marginLeft="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/u249"
- android:text=""/>
+ android:text=""
+ android:textSize="@dimen/w14dp"
+ />
<TextView
android:id="@+id/fragment_check_in_right_save"
android:layout_width="@dimen/w40dp"
@@ -41,7 +45,8 @@
android:layout_marginRight="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/u208"
- android:text=""/>
+ android:text=""
+ android:textSize="@dimen/w14dp"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
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 9ef0f39..5154786 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
@@ -11,6 +11,7 @@
android:layout_marginTop="@dimen/h10dp"
android:layout_centerVertical="true"
android:textColor="#8BD2F6"
+ android:textSize="@dimen/w14dp"
/>
<LinearLayout
android:layout_width="match_parent"
@@ -28,7 +29,8 @@
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"
@@ -38,7 +40,7 @@
<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="@dimen/w22dp"
@@ -72,7 +74,7 @@
android:drawableLeft="@drawable/u216"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
</RelativeLayout>
@@ -102,7 +104,7 @@
android:drawableLeft="@drawable/u222"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
@@ -110,7 +112,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>
<RelativeLayout
@@ -139,7 +141,7 @@
android:drawableLeft="@drawable/u325"
android:drawablePadding="@dimen/w20dp"
android:gravity="center_vertical"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
</LinearLayout>
<View
@@ -152,10 +154,10 @@
<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"
@@ -183,7 +185,7 @@
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"/>
</LinearLayout>
</RelativeLayout>
@@ -213,7 +215,7 @@
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"/>
</LinearLayout>
<View
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml
index a4c05cc..d121a26 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left_row.xml
@@ -26,7 +26,7 @@
android:drawableLeft="@mipmap/ic_launcher"
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"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
index 94763d0..3fefa4c 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
@@ -68,11 +68,12 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_navigation"
+ android:textSize="@dimen/w20dp"
android:text="鏃犵嚎WIFI璁剧疆"
android:gravity="left"
android:layout_gravity="left"
- android:textColor="@color/colorPrimary"/>
+ android:textColor="@color/colorPrimary"
+ />
</LinearLayout>
<Switch
android:layout_width="wrap_content"
@@ -106,7 +107,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="閫夋嫨缃戠粶"
android:gravity="left"
android:layout_gravity="left"
@@ -135,7 +136,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="缃戠粶1"
android:gravity="left"
android:layout_gravity="left"
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 7bddd19..5531609 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
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鎽勫儚鏈�1璁剧疆"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
/>
@@ -44,7 +44,7 @@
android:layout_marginTop="@dimen/h15dp"
android:layout_marginBottom="@dimen/h12dp"
android:text="鎽勫儚澶�1"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"
/>
<View
@@ -57,7 +57,7 @@
android:textColor="@color/colorPrimary"
android:textStyle="bold"
android:layout_marginTop="@dimen/h20dp"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="IP鍦板潃"/>
<EditText
android:id="@+id/fragment_check_in_right_remark"
@@ -68,7 +68,7 @@
android:layout_marginBottom="@dimen/h12dp"
android:hint=""
android:textColorHint="@color/colorText_b"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"/>
<View
android:layout_width="match_parent"
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 07e8337..76f7e44 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
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鎽勫儚鏈�2璁剧疆"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
/>
@@ -44,7 +44,7 @@
android:layout_marginTop="@dimen/h15dp"
android:layout_marginBottom="@dimen/h12dp"
android:text="鎽勫儚澶�2"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"
/>
<View
@@ -57,7 +57,7 @@
android:textColor="@color/colorPrimary"
android:textStyle="bold"
android:layout_marginTop="@dimen/h20dp"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="IP鍦板潃"/>
<EditText
android:id="@+id/fragment_check_in_right_remark"
@@ -68,7 +68,7 @@
android:layout_marginBottom="@dimen/h12dp"
android:hint=""
android:textColorHint="@color/colorText_b"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"/>
<View
android:layout_width="match_parent"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
index 3d0f1f1..9a49e12 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
@@ -68,7 +68,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_navigation"
+ android:textSize="@dimen/w20dp"
android:text="鏈夌嚎缃戠粶璁剧疆"
android:gravity="left"
android:layout_gravity="left"
@@ -106,7 +106,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="閫夋嫨缃戠粶"
android:gravity="left"
android:layout_gravity="left"
@@ -135,7 +135,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="缃戠粶1"
android:gravity="left"
android:layout_gravity="left"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml
index 771e364..583540d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鎵�鏈夊鏍¤缃�"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
/>
@@ -44,7 +44,7 @@
android:layout_marginTop="@dimen/h15dp"
android:layout_marginBottom="@dimen/h12dp"
android:text="鏈濋槼灏忓"
- android:textSize="@dimen/text_size_normal"
+ android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"
/>
<View
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml
index b3ec3f9..d3eb0c8 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml
@@ -68,7 +68,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_navigation"
+ android:textSize="@dimen/w20dp"
android:text="鏃犵嚎WIFI璁剧疆"
android:gravity="left"
android:layout_gravity="left"
@@ -106,7 +106,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="閫夋嫨缃戠粶"
android:gravity="left"
android:layout_gravity="left"
@@ -135,7 +135,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="缃戠粶1"
android:gravity="left"
android:layout_gravity="left"
--
Gitblit v1.8.0