From 5f6f6485349c6c2b4d046f4307a8b8c8b251bdc1 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 03 五月 2017 10:07:13 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 18 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml | 16
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml | 2
VisitFace/DemoForBsk/app/src/main/res/layout/no_more.xml | 4
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml | 38 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml | 12
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml | 4
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml | 2
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_row.xml | 14
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java | 6
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml | 2
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml | 8
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right_interviewee.xml | 46 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml | 8
VisitFace/DemoForBsk/app/src/main/res/layout/pull_to_refresh_header.xml | 15 -
VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml | 4
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml | 8
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml | 13
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_first_letter_row.xml | 8
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml | 14
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml | 2
VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml | 4
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml | 15
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml | 14
VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml | 4
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml | 38 ++--
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml | 16
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml | 8
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 18 +-
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml | 6
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml | 110 ++++++------
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml | 12
32 files changed, 250 insertions(+), 239 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java
index f5d0900..5301f2c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/widget/checkin/CheckInRightIntervieweeCell.java
@@ -3,6 +3,7 @@
import android.content.Context;
import android.net.Uri;
import android.util.AttributeSet;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
@@ -53,6 +54,11 @@
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View view = inflater.inflate(R.layout.fragment_check_in_right_interviewee,this);
ViewUtils.inject(this, view);
+ float x = fragment_check_in_right_interviewee_cell_name.getTextSize();
+
+ //fragment_check_in_right_interviewee_cell_name.setTextSize(TypedValue.COMPLEX_UNIT_PX, 50f);
+ //float y = fragment_check_in_right_interviewee_cell_name.getTextSize();
+ //System.out.println("h");
}
public void setIntervieweeInfo(final CheckInQueryItem item) {
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml
index 9a78275..8886161 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/activity_main_tab.xml
@@ -12,5 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/h5dp"
- android:textColor="@color/tab_item_tv"/>
+ android:textColor="@color/tab_item_tv"
+ android:textSize="@dimen/w14dp"
+ />
</LinearLayout>
\ No newline at end of file
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 9b23b7d..d02bdb2 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
@@ -79,7 +79,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="@string/visitor_reason"
android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
/>
@@ -91,7 +91,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
@@ -104,7 +104,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="@string/visitor_remark"/>
<EditText
android:id="@+id/fragment_check_in_right_remark"
@@ -115,7 +115,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_check_in_right_interviewee.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml
index 31ca166..43c8986 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_interviewee.xml
@@ -13,7 +13,7 @@
android:textColor="@color/colorText_5"
android:paddingTop="@dimen/w5dp"
android:paddingBottom="@dimen/h5dp"
- android:textSize="24sp"
+ android:textSize="@dimen/w24dp"
android:text="琚浜哄鍚�"
/>
@@ -46,6 +46,7 @@
android:layout_height="@dimen/h100dp"
android:layout_gravity="center_horizontal"
android:text="娣诲姞\n琚浜哄憳"
+ android:textSize="@dimen/w16dp"
android:gravity="center"
android:layout_alignParentTop="true" />
</RelativeLayout>
@@ -59,14 +60,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="閮ㄩ棬锛�"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_check_in_right_interviewee_cell_dept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_b"/>
</LinearLayout>
<LinearLayout
@@ -79,14 +80,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鑱屽姟锛�"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_check_in_right_interviewee_cell_post"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_b"/>
</LinearLayout>
<LinearLayout
@@ -102,6 +103,7 @@
android:gravity="center"
android:textColor="@android:color/white"
android:background="@drawable/main_btn_bcg"
+ android:textSize="@dimen/w16dp"
android:text="鍛煎彨鎵嬫満"/>
<TextView
android:id="@+id/fragment_check_in_right_interviewee_cell_call_tel"
@@ -111,6 +113,7 @@
android:layout_marginLeft="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/main_btn_bcg"
+ android:textSize="@dimen/w16dp"
android:text="鍛煎彨搴ф満"/>
</LinearLayout>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
index b2a44d1..942b5ae 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right_visitor.xml
@@ -13,7 +13,7 @@
android:textColor="@color/colorText_5"
android:paddingTop="@dimen/h5dp"
android:paddingBottom="@dimen/h5dp"
- android:textSize="24sp"
+ android:textSize="@dimen/w24dp"
android:text="鏉ヨ浜哄憳濮撳悕"
/>
@@ -49,6 +49,7 @@
android:layout_height="@dimen/h100dp"
android:layout_gravity="center_horizontal"
android:text="娣诲姞\n鏉ヨ浜哄憳"
+ android:textSize="@dimen/w16dp"
android:gravity="center"
android:layout_alignParentTop="true" />
</RelativeLayout>
@@ -62,14 +63,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鑱旂郴鐢佃瘽锛�"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_check_in_right_visitor_cell_mobile_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_b"/>
</LinearLayout>
<LinearLayout
@@ -81,14 +82,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍏徃鍚嶇О锛�"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_check_in_right_visitor_cell_company_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_b"/>
</LinearLayout>
<LinearLayout
@@ -100,14 +101,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="璇佷欢缂栧彿锛�"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_check_in_right_visitor_cell_identity_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_b"/>
</LinearLayout>
</LinearLayout>
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 d38cae4..94763d0 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
@@ -147,7 +147,7 @@
android:background="@drawable/u39"
/>
<TextView
- android:layout_width="10dp"
+ android:layout_width="@dimen/w10dp"
android:layout_height="wrap_content"
/>
<TextView
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 1063e93..7bddd19 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
@@ -12,19 +12,19 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="76dp"
+ android:layout_height="@dimen/h76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout
android:orientation="vertical"
- android:layout_width="596dp"
+ android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
>
<LinearLayout
- android:layout_width="611dp"
+ android:layout_width="@dimen/w611dp"
android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/h20dp"
android:orientation="vertical">
<TextView
@@ -41,8 +41,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="15dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
android:text="鎽勫儚澶�1"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/h20dp"
android:textSize="@dimen/text_size_big"
android:text="IP鍦板潃"/>
<EditText
@@ -64,8 +64,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="15dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
android:hint=""
android:textColorHint="@color/colorText_b"
android:textSize="@dimen/text_size_normal"
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 56df2ad..07e8337 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
@@ -12,19 +12,19 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="76dp"
+ android:layout_height="@dimen/h76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout
android:orientation="vertical"
- android:layout_width="596dp"
+ android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
>
<LinearLayout
- android:layout_width="611dp"
+ android:layout_width="@dimen/w611dp"
android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/h20dp"
android:orientation="vertical">
<TextView
@@ -41,8 +41,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="15dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
android:text="鎽勫儚澶�2"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/h20dp"
android:textSize="@dimen/text_size_big"
android:text="IP鍦板潃"/>
<EditText
@@ -64,8 +64,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="15dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
android:hint=""
android:textColorHint="@color/colorText_b"
android:textSize="@dimen/text_size_normal"
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 cbf7757..3d0f1f1 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
@@ -12,40 +12,40 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="76dp"
+ android:layout_height="@dimen/h76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/fragment_device_right_delete"
- android:layout_width="40dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
android:textColor="@android:color/white"
android:background="@drawable/u194"
android:text=""/>
<TextView
android:id="@+id/fragment_device_right_add"
- android:layout_width="40dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
- android:layout_marginLeft="10dp"
+ android:layout_marginLeft="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/u249"
android:text=""/>
<TextView
android:id="@+id/fragment_device_right_save"
- android:layout_width="40dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:layout_marginRight="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/u208"
android:text=""/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
- android:layout_width="596dp"
+ android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
>
<LinearLayout
@@ -53,8 +53,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -85,14 +85,14 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
+ android:paddingTop="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -120,8 +120,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -147,7 +147,7 @@
android:background="@drawable/u39"
/>
<TextView
- android:layout_width="10dp"
+ android:layout_width="@dimen/w10dp"
android:layout_height="wrap_content"
/>
<TextView
@@ -160,7 +160,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
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 148191b..771e364 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
@@ -12,19 +12,19 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="76dp"
+ android:layout_height="@dimen/h76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout
android:orientation="vertical"
- android:layout_width="596dp"
+ android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
>
<LinearLayout
- android:layout_width="611dp"
+ android:layout_width="@dimen/w611dp"
android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/h20dp"
android:orientation="vertical">
<TextView
@@ -41,8 +41,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
- android:layout_marginTop="15dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
android:text="鏈濋槼灏忓"
android:textSize="@dimen/text_size_normal"
android:textColor="@color/colorText_b"
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 fd73119..b3ec3f9 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
@@ -12,40 +12,40 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="76dp"
+ android:layout_height="@dimen/h76dp"
android:gravity="right|center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/fragment_device_right_delete"
- android:layout_width="40dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
android:textColor="@android:color/white"
android:background="@drawable/u194"
android:text=""/>
<TextView
android:id="@+id/fragment_device_right_add"
- android:layout_width="40dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
- android:layout_marginLeft="10dp"
+ android:layout_marginLeft="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/u249"
android:text=""/>
<TextView
android:id="@+id/fragment_device_right_save"
- android:layout_width="40dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
+ android:layout_marginLeft="@dimen/w10dp"
+ android:layout_marginRight="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/u208"
android:text=""/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
- android:layout_width="596dp"
+ android:layout_width="@dimen/w596dp"
android:layout_height="wrap_content"
>
<LinearLayout
@@ -53,8 +53,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -85,14 +85,14 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
+ android:paddingTop="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -120,8 +120,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -147,7 +147,7 @@
android:background="@drawable/u39"
/>
<TextView
- android:layout_width="10dp"
+ android:layout_width="@dimen/w10dp"
android:layout_height="wrap_content"
/>
<TextView
@@ -160,7 +160,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml
index 79dd768..2bafd67 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left.xml
@@ -5,10 +5,10 @@
<TextView
android:id="@+id/fragment_phone_call_left_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_phone_call_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"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_first_letter_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_first_letter_row.xml
index fca32e4..303b1bb 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_first_letter_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_first_letter_row.xml
@@ -5,14 +5,14 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingLeft="20dp"
- android:paddingRight="20dp">
+ android:paddingLeft="@dimen/w20dp"
+ android:paddingRight="@dimen/w20dp">
<RelativeLayout
android:id="@+id/fragment_phone_call_left_row_relativeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="12dp"
- android:paddingBottom="12dp">
+ android:paddingTop="@dimen/h12dp"
+ android:paddingBottom="@dimen/h12dp">
<TextView
android:id="@+id/fragment_phone_call_left_row_first_letter_name"
android:layout_width="wrap_content"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_row.xml
index 02dc7fd..9738334 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_left_row.xml
@@ -5,14 +5,14 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingLeft="20dp"
- android:paddingRight="20dp">
+ android:paddingLeft="@dimen/w20dp"
+ android:paddingRight="@dimen/w20dp">
<RelativeLayout
android:id="@+id/fragment_phone_call_left_row_relativeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="12dp"
- android:paddingBottom="12dp">
+ android:paddingTop="@dimen/h12dp"
+ android:paddingBottom="@dimen/h12dp">
<TextView
android:id="@+id/fragment_phone_call_left_row_name"
android:layout_width="wrap_content"
@@ -28,13 +28,13 @@
android:text=""
android:layout_centerVertical="true"
android:layout_toRightOf="@id/fragment_phone_call_left_row_name"
- android:layout_marginLeft="20dp"
+ android:layout_marginLeft="@dimen/w20dp"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_phone_call_left_row_photo"
- android:layout_width="36dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w36dp"
+ android:layout_height="@dimen/h36dp"
fresco:roundAsCircle = "true"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"/>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml
index 5ebf012..d269e53 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right.xml
@@ -5,8 +5,8 @@
<cn.com.basic.face.widget.phonecall.PhoneCallRightIntervieweeCell
android:id="@+id/fragment_phone_call_right_interviewee_cell"
- android:layout_width="254dp"
- android:layout_height="350dp"
+ android:layout_width="@dimen/w254dp"
+ android:layout_height="@dimen/h350dp"
android:background="@drawable/card_bcg"
android:layout_centerInParent="true"
android:orientation="vertical"/>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right_interviewee.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right_interviewee.xml
index b4ad76a..1e2f654 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right_interviewee.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_phone_call_right_interviewee.xml
@@ -11,9 +11,9 @@
android:layout_height="wrap_content"
android:id="@+id/fragment_phone_call_right_interviewee_cell_name"
android:textColor="@color/colorText_5"
- android:paddingTop="@dimen/view_size_5"
- android:paddingBottom="@dimen/view_size_5"
- android:textSize="24sp"
+ android:paddingTop="@dimen/h5dp"
+ android:paddingBottom="@dimen/h5dp"
+ android:textSize="@dimen/w24dp"
android:text="琚浜哄鍚�"
/>
@@ -35,23 +35,23 @@
android:layout_marginTop="@dimen/view_size_25"
/>-->
<RelativeLayout
- android:layout_width="100dp"
- android:layout_height="100dp"
- android:layout_marginTop="25dp"
+ android:layout_width="@dimen/w100dp"
+ android:layout_height="@dimen/h100dp"
+ android:layout_marginTop="@dimen/h25dp"
android:layout_gravity="center_horizontal"
>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_phone_call_right_interviewee_cell_photo"
- android:layout_width="100dp"
- android:layout_height="100dp"
+ android:layout_width="@dimen/w100dp"
+ android:layout_height="@dimen/h100dp"
fresco:roundAsCircle = "true"
android:layout_gravity="center_horizontal"
android:background="@drawable/u202"
android:layout_alignParentTop="true" />
<TextView
android:id="@+id/fragment_phone_call_right_interviewee_cell_photo_placeholder"
- android:layout_width="100dp"
- android:layout_height="100dp"
+ android:layout_width="@dimen/w100dp"
+ android:layout_height="@dimen/h100dp"
android:layout_gravity="center_horizontal"
android:text="娣诲姞\n琚浜哄憳"
android:gravity="center"
@@ -60,65 +60,67 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="40dp"
+ android:layout_marginTop="@dimen/h40dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="閮ㄩ棬锛�"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_phone_call_right_interviewee_cell_dept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_b"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="25dp"
+ android:layout_marginTop="@dimen/h25dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鑱屽姟锛�"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_phone_call_right_interviewee_cell_post"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textColor="@color/colorText_b"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/view_size_25"
+ android:layout_marginTop="@dimen/h25dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/fragment_phone_call_right_interviewee_cell_call_mobile"
- android:layout_width="90dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w90dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
android:textColor="@android:color/white"
android:background="@drawable/main_btn_bcg"
+ android:textSize="@dimen/w16dp"
android:text="鍛煎彨鎵嬫満"/>
<TextView
android:id="@+id/fragment_phone_call_right_interviewee_cell_call_tel"
- android:layout_width="90dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w90dp"
+ android:layout_height="@dimen/h36dp"
android:gravity="center"
- android:layout_marginLeft="@dimen/view_size_10"
+ android:layout_marginLeft="@dimen/w10dp"
android:textColor="@android:color/white"
android:background="@drawable/main_btn_bcg"
+ android:textSize="@dimen/w16dp"
android:text="鍛煎彨搴ф満"/>
</LinearLayout>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
index 745a2d2..3e47012 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance.xml
@@ -43,7 +43,7 @@
android:id="@+id/fragment_supervisory_enter_camera" />
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/view_size_50"
+ android:layout_height="@dimen/h50dp"
android:layout_alignParentBottom="true"
android:background="#40000000">
<TextView
@@ -65,7 +65,7 @@
android:layout_alignParentRight="true"
android:background="@drawable/surface_info_bcg"
android:text="鎽勫儚鏈鸿繘"
- android:layout_marginRight="12dp"/>
+ android:layout_marginRight="@dimen/w122dp"/>
</RelativeLayout>
</RelativeLayout>
@@ -83,7 +83,7 @@
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/view_size_50"
+ android:layout_height="@dimen/h50dp"
android:layout_alignParentBottom="true"
android:background="#40000000">
<TextView
@@ -92,7 +92,7 @@
android:layout_centerVertical="true"
android:textSize="@dimen/text_size_normal"
android:textColor="@android:color/white"
- android:layout_marginLeft="16dp"
+ android:layout_marginLeft="@dimen/w16dp"
android:text="2016骞�12鏈�5鏃� 17锛�03锛�42鍒�"
android:id="@+id/fragment_surveillance_exit_timer"
/>
@@ -114,14 +114,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="4dp"
- android:paddingRight="4dp"
+ android:layout_marginTop="@dimen/h4dp"
+ android:paddingRight="@dimen/h4dp"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
<RadioGroup
- android:layout_width="64dp"
+ android:layout_width="@dimen/w64dp"
android:layout_height="match_parent"
android:id="@+id/fragment_supervisory_bottom_left_radio_group">
@@ -151,7 +151,7 @@
android:text="鑰冨嫟"/>
</RadioGroup>
<LinearLayout
- android:layout_width="5dp"
+ android:layout_width="@dimen/w5dp"
android:layout_height="match_parent"
android:orientation="vertical">
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
index 70dd9db..20df68c 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_attendance_cell.xml
@@ -8,15 +8,15 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_home_bottom_attendance_cell_photo"
- android:layout_width="122dp"
- android:layout_height="127dp"
- fresco:roundedCornerRadius="5dp"
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h127dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
/>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="20dp"
+ android:layout_height="@dimen/h20dp"
android:background="#40000000"
android:layout_alignParentBottom="true">
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml
index 9356184..50c85a5 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_register_cell.xml
@@ -6,8 +6,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_home_bottom_register_cell_photo"
- android:layout_width="122dp"
- android:layout_height="127dp"
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h127dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
/>
@@ -19,8 +19,8 @@
android:gravity="center"
android:textSize="@dimen/text_size_big"
android:text="娉ㄥ唽"
- android:layout_marginBottom="30dp"
- android:layout_marginRight="10dp"
+ android:layout_marginBottom="@dimen/h30dp"
+ android:layout_marginRight="@dimen/w10dp"
android:layout_alignParentBottom="true"
android:textColor="@android:color/white"
android:layout_alignParentRight="true"/>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
index d0d285b..f0749d0 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_surveillance_bottom_visitor_cell.xml
@@ -8,9 +8,9 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_home_bottom_visitor_cell_photo"
- android:layout_width="122dp"
- android:layout_height="127dp"
- fresco:roundedCornerRadius="5dp"
+ android:layout_width="@dimen/w122dp"
+ android:layout_height="@dimen/h127dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
android:layout_alignParentBottom="true"
android:scaleType="centerCrop"
/>
@@ -19,8 +19,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/colorRed"
- android:paddingRight="7dp"
- android:paddingLeft="10dp"
+ android:paddingRight="@dimen/w7dp"
+ android:paddingLeft="@dimen/w10dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:textSize="@dimen/text_size_big"
@@ -29,7 +29,7 @@
android:layout_alignParentRight="true"/>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="20dp"
+ android:layout_height="@dimen/h20dp"
android:background="#40000000"
android:layout_alignParentBottom="true">
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml
index e2b6add..1f86727 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left.xml
@@ -6,10 +6,10 @@
<TextView
android:id="@+id/fragment_visit_left_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"
/>
@@ -22,10 +22,10 @@
android:id="@+id/fragment_visit_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"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml
index b3e71cb..294dc2d 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_date_row.xml
@@ -9,6 +9,6 @@
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"
android:background="@color/colorBackground"
- android:padding="22dp"
+ android:padding="@dimen/w22dp"
android:text=""/>
</LinearLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml
index 09cae76..1bac395 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_left_person_row.xml
@@ -9,9 +9,9 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="15dp"
- android:paddingBottom="15dp"
- android:layout_marginLeft="24dp"
+ android:paddingTop="@dimen/h15dp"
+ android:paddingBottom="@dimen/h15dp"
+ android:layout_marginLeft="@dimen/w24dp"
android:id="@+id/fragment_visit_left_relative_layout"
>
<RadioButton
@@ -26,14 +26,14 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/fragment_visit_left_person_row_check_box"
- android:layout_marginLeft="12dp"
+ android:layout_marginLeft="@dimen/w12dp"
android:textColor="@color/colorText_5"
android:text=""
android:textSize="@dimen/text_size_normal"/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_visit_left_person_row_photo"
- android:layout_width="36dp"
- android:layout_height="36dp"
+ android:layout_width="@dimen/w36dp"
+ android:layout_height="@dimen/h36dp"
fresco:roundAsCircle = "true"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/fragment_visit_left_person_row_photo"
- android:layout_marginRight="@dimen/view_size_10"
+ android:layout_marginRight="@dimen/w10dp"
android:textColor="@color/colorText_5"
android:text=""
android:textSize="@dimen/text_size_normal"/>
@@ -54,6 +54,6 @@
android:id="@+id/fragment_visit_left_line"
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
- android:layout_marginLeft="24dp"
+ android:layout_marginLeft="@dimen/w24dp"
android:background="@color/colorText_b"/>
</LinearLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml
index fb92f35..847248c 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml
@@ -8,7 +8,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/h20dp"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="wrap_content"
@@ -18,19 +18,19 @@
android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_visit_right_head_photo"
- android:layout_width="197dp"
- android:layout_height="197dp"
- fresco:roundedCornerRadius="5dp"
+ android:layout_width="@dimen/w197dp"
+ android:layout_height="@dimen/h197dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
android:background="#07000000"
fresco:placeholderImageScaleType="fitXY"
/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_visit_right_card_photo"
- android:layout_width="330dp"
- android:layout_height="197dp"
+ android:layout_width="@dimen/w330dp"
+ android:layout_height="@dimen/h197dp"
fresco:placeholderImageScaleType="fitXY"
- android:layout_marginLeft="79dp"
- fresco:roundedCornerRadius="5dp"
+ android:layout_marginLeft="@dimen/w79dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
fresco:roundTopLeft="true"
fresco:roundTopRight="true"
fresco:roundBottomLeft="true"
@@ -42,9 +42,9 @@
android:layout_height="wrap_content">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_visit_right_head_photo_placeholder_image"
- android:layout_width="197dp"
- android:layout_height="197dp"
- fresco:roundedCornerRadius="5dp"
+ android:layout_width="@dimen/w197dp"
+ android:layout_height="@dimen/h197dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
android:alpha="0.35"
android:background="@drawable/u45"
/>
@@ -52,31 +52,31 @@
android:id="@+id/fragment_visit_right_card_photo_placeholder_image"
android:layout_height="197dp"
fresco:placeholderImageScaleType="fitXY"
- android:layout_marginLeft="79dp"
- fresco:roundedCornerRadius="5dp"
+ android:layout_marginLeft="@dimen/w79dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
android:background="#07000000"
fresco:roundTopLeft="true"
fresco:roundTopRight="true"
fresco:roundBottomLeft="true"
fresco:roundBottomRight="true"
- android:layout_width="330dp" />
+ android:layout_width="@dimen/w330dp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/fragment_visit_right_head_photo_placeholder_text_view"
- android:layout_width="197dp"
- android:layout_height="197dp"
+ android:layout_width="@dimen/w197dp"
+ android:layout_height="@dimen/h197dp"
android:background="#07000000"
android:src="@drawable/u45"
android:visibility="invisible"
/>
<TextView
android:id="@+id/fragment_visit_right_card_photo_placeholder_text_view"
- android:layout_width="330dp"
- android:layout_height="197dp"
- android:layout_marginLeft="79dp"
+ android:layout_width="@dimen/w330dp"
+ android:layout_height="@dimen/h197dp"
+ android:layout_marginLeft="@dimen/w79dp"
android:text="璇佷欢鐓�"
android:gravity="center"
android:layout_gravity="center"
@@ -92,12 +92,12 @@
android:layout_alignStart="@id/fragment_visit_right_linear_layout"
android:layout_alignEnd="@id/fragment_visit_right_linear_layout"
android:layout_below="@id/fragment_visit_right_linear_layout"
- android:layout_marginTop="15dp">
+ android:layout_marginTop="@dimen/h15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:paddingLeft="8dp">
+ android:paddingLeft="@dimen/w8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -110,14 +110,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
@@ -136,7 +136,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -160,21 +160,21 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
@@ -193,7 +193,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -225,14 +225,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
@@ -251,7 +251,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -275,7 +275,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
<LinearLayout
@@ -283,14 +283,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
@@ -309,7 +309,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -341,21 +341,21 @@
android:textColor="@color/colorPrimary"
android:textSize="@dimen/text_size_big"
android:textStyle="bold"
- android:layout_marginTop="28dp"
+ android:layout_marginTop="@dimen/h28dp"
android:text="@string/visitor_information"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
@@ -374,7 +374,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -398,21 +398,21 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
@@ -431,7 +431,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -455,21 +455,21 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
@@ -488,7 +488,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -512,7 +512,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml
index 47daf81..d2bbb63 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row.xml
@@ -4,15 +4,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -33,7 +33,7 @@
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml
index 98860ec..e16e06b 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row1.xml
@@ -6,8 +6,8 @@
>
<LinearLayout
android:id="@+id/parent_view"
- android:paddingTop="13dp"
- android:paddingBottom="13dp"
+ android:paddingTop="@dimen/h13dp"
+ android:paddingBottom="@dimen/h13dp"
android:gravity="center_horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -17,6 +17,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
android:background="@color/colorText_b"
- android:layout_marginLeft="5dp"/>
+ android:layout_marginLeft="@dimen/w5dp"/>
</LinearLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml
index 9de9ee1..4428bd1 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_left.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:id="@+id/fragment_visit_right_form_row_left_linear_layout"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml
index ce8f4dd..1943544 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right_form_row_right.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
index 1165399..2d022c6 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/load_more.xml
@@ -6,8 +6,8 @@
android:orientation="vertical">
<TextView
android:id="@+id/load_more_text_view"
- android:paddingTop="20dp"
- android:paddingBottom="20dp"
+ android:paddingTop="@dimen/h20dp"
+ android:paddingBottom="@dimen/h20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="鍔犺浇鏇村"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/no_more.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/no_more.xml
index 1218709..169ca28 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/no_more.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/no_more.xml
@@ -6,8 +6,8 @@
android:orientation="vertical">
<TextView
android:id="@+id/no_more_text_view"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="20dp"
+ android:layout_marginTop="@dimen/h20dp"
+ android:layout_marginBottom="@dimen/h20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="娌℃湁鏁版嵁"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/pull_to_refresh_header.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/pull_to_refresh_header.xml
index 6895075..fdaae58 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/pull_to_refresh_header.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/pull_to_refresh_header.xml
@@ -2,8 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:paddingTop="10dp"
- android:paddingBottom="10dip">
+ android:paddingTop="@dimen/h10dp"
+ android:paddingBottom="@dimen/h10dp">
<TextView
android:id="@+id/pull_to_refresh_text"
@@ -19,8 +19,8 @@
android:indeterminate="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="20dip"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w20dp"
android:visibility="gone"
android:layout_centerVertical="true"
style="?android:attr/progressBarStyleSmall" />
@@ -29,10 +29,7 @@
android:id="@+id/pull_to_refresh_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="20dip"
+ android:layout_marginLeft="@dimen/w30dp"
+ android:layout_marginRight="@dimen/w20dp"
android:layout_centerVertical="true" />
-
-
-
</RelativeLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml
index 36596b5..563caac 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/reach_bottom.xml
@@ -6,8 +6,8 @@
android:orientation="vertical">
<TextView
android:id="@+id/load_more_text_view"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="20dp"
+ android:layout_marginTop="@dimen/h20dp"
+ android:layout_marginBottom="@dimen/h20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
--
Gitblit v1.8.0