From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_check_in_right.xml | 121 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 42 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 8321132..24dd7a5 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
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ >
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -9,39 +10,46 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:id="@+id/fragment_check_in_right_parent"
+ >
<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_check_in_right_print"
- 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/u321"
- android:text=""/>
+ android:text=""
+ android:textSize="@dimen/w14dp"
+ />
<TextView
android:id="@+id/fragment_check_in_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=""/>
+ android:text=""
+ android:textSize="@dimen/w14dp"
+ />
<TextView
android:id="@+id/fragment_check_in_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=""/>
+ android:text=""
+ android:textSize="@dimen/w14dp"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -49,41 +57,70 @@
android:orientation="horizontal">
<cn.com.basic.face.widget.checkin.CheckInRightVisitorCell
android:id="@+id/fragment_check_in_right_visitor_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:orientation="vertical"></cn.com.basic.face.widget.checkin.CheckInRightVisitorCell>
-
+ android:orientation="vertical"/>
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/u252"
+ android:layout_marginLeft="@dimen/w45dp"
+ android:layout_gravity="center_vertical"
+ />
<cn.com.basic.face.widget.checkin.CheckInRightIntervieweeCell
android:id="@+id/fragment_check_in_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_marginLeft="103dp"
- android:orientation="vertical"></cn.com.basic.face.widget.checkin.CheckInRightIntervieweeCell>
+ android:layout_marginLeft="@dimen/w45dp"
+ android:orientation="vertical"/>
</LinearLayout>
<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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
- android:textSize="@dimen/text_size_big"
- android:text="@string/visitor_reason"/>
- <TextView
- android:id="@+id/fragment_check_in_right_visitor_reason"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@null"
- android:layout_marginTop="15dp"
- android:layout_marginBottom="12dp"
- android:text=""
- android:textSize="@dimen/text_size_normal"
- android:textColor="@color/colorText_b"/>
+ android:textSize="@dimen/w16dp"
+ android:text="@string/visitor_reason"
+ android:id="@+id/fragment_check_in_right_visitor_reason_text_view"
+ />
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <EditText
+ android:id="@+id/fragment_check_in_right_visitor_reason"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:layout_marginTop="@dimen/h15dp"
+ android:layout_marginBottom="@dimen/h12dp"
+ android:text=""
+ android:textSize="@dimen/w14dp"
+ android:textColor="@color/colorText_b"
+ />
+ <TextView
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/w40dp"
+ android:background="@drawable/u36"
+ android:id="@+id/fragment_check_in_right_visitor_reason_edit"
+ android:layout_alignParentRight="true"
+ />
+ <TextView
+ android:layout_width="@dimen/w40dp"
+ android:layout_height="@dimen/w40dp"
+ android:background="@drawable/u38"
+ android:id="@+id/fragment_check_in_right_visitor_reason_more"
+ android:layout_toLeftOf="@id/fragment_check_in_right_visitor_reason_edit"
+ android:layout_marginRight="@dimen/w10dp"
+ />
+ </RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_1"
@@ -93,19 +130,19 @@
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
- android:layout_marginTop="20dp"
- android:textSize="@dimen/text_size_big"
+ android:layout_marginTop="@dimen/h20dp"
+ android:textSize="@dimen/w16dp"
android:text="@string/visitor_remark"/>
<EditText
android:id="@+id/fragment_check_in_right_remark"
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"
+ android:textSize="@dimen/w14dp"
android:textColor="@color/colorText_b"/>
<View
android:layout_width="match_parent"
--
Gitblit v1.8.0