From e26a5550539fa0cad91313bf9670df605199a324 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 15 八月 2017 13:55:25 +0800
Subject: [PATCH] capnproto fix bug
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml | 186 +++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 94 deletions(-)
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 4c8e115..c6971a0 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:background="@drawable/u45"
+ 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,47 +42,45 @@
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:background="#07000000"
- android:src="@drawable/u45"
- fresco:placeholderImageScaleType="fitXY"
+ android:layout_width="@dimen/w197dp"
+ android:layout_height="@dimen/h197dp"
+ fresco:roundedCornerRadius="@dimen/w5dp"
+ android:alpha="0.35"
+ android:background="@drawable/u45"
/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/fragment_visit_right_card_photo_placeholder_image"
- android:layout_width="330dp"
- android:layout_height="197dp"
+ android:layout_height="@dimen/h197dp"
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="@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"
- android:textSize="@dimen/text_size_navigation"
+ android:textSize="@dimen/w20dp"
android:background="#00000000"
/>
</LinearLayout>
@@ -94,17 +92,17 @@
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"
android:textColor="@color/colorPrimary"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:textStyle="bold"
android:text="@string/base_information"/>
<LinearLayout
@@ -112,47 +110,47 @@
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="濮撳悕锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鐢佃瘽锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
@@ -162,54 +160,54 @@
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鎬у埆锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_gender"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="璇佷欢绫诲瀷锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_id_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
@@ -219,7 +217,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
@@ -227,47 +225,47 @@
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鍥界睄锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_country"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="璇佷欢缂栧彿锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_id_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
@@ -277,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
@@ -285,47 +283,47 @@
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鍑虹敓鏃ユ湡锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_birthday"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鍏徃鍚嶇О锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_company"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
@@ -335,62 +333,62 @@
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>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鎷滆浜猴細"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_person"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鎷滆浜嬫儏锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_visit_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
@@ -400,54 +398,54 @@
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鏉ヨ閮ㄩ棬锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_from_dept"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="璁块棶鐘舵�侊細"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
@@ -457,54 +455,54 @@
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="鏉ヨ鏃堕棿锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_visit_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
</LinearLayout>
<LinearLayout
- android:layout_width="298dp"
+ android:layout_width="@dimen/w298dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text="绂诲紑鏃堕棿锛�"
android:textColor="@color/colorText_5"/>
<TextView
android:id="@+id/fragment_visit_right_exit_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="@dimen/text_size_big"
+ android:textSize="@dimen/w16dp"
android:text=""
android:textColor="@color/colorText_b"
android:background="@null"/>
@@ -514,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>
--
Gitblit v1.8.0