From 3839ef806215a981ef9b2e83dafaab5e1d694764 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 16:22:31 +0800
Subject: [PATCH] detect only develop finished
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml | 128 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 67 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml
index 2ef8512..e9ef0ea 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:register="http://schemas.android.com/apk/res-auto"
android:id="@+id/fragment_register_linear_layout"
android:orientation="vertical" android:layout_width="match_parent"
android:background="@android:color/white"
@@ -35,21 +36,8 @@
android:orientation="horizontal"
android:layout_alignParentBottom="true"
android:layout_height="40dp">
- <!--<ImageView
- android:id="@+id/register_add"
- android:src="@mipmap/ic_launcher"
- android:layout_width="20dp"
- android:layout_height="20dp" />
- <ImageView
- android:id="@+id/register_save"
- android:layout_marginLeft="19dp"
- android:layout_marginRight="35dp"
- android:src="@mipmap/ic_launcher"
- android:layout_width="20dp"
- android:layout_height="20dp" />
- -->
<TextView
- android:id="@+id/register_add"
+ android:id="@+id/fragment_register_add"
android:layout_width="40dp"
android:layout_height="36dp"
android:gravity="center"
@@ -58,7 +46,7 @@
android:background="@drawable/main_btn_bcg"
android:text="娣诲姞"/>
<TextView
- android:id="@+id/register_save"
+ android:id="@+id/fragment_register_save"
android:layout_width="40dp"
android:layout_height="36dp"
android:gravity="center"
@@ -70,7 +58,6 @@
</LinearLayout>
</RelativeLayout>
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -78,23 +65,15 @@
android:gravity="center_horizontal"
android:orientation="horizontal">
- <com.facebook.drawee.view.SimpleDraweeView
- android:id="@+id/register_choose_photo"
- android:layout_width="147dp"
- android:layout_height="206dp"
- android:gravity="center"
- />
- <!--<TextView
- android:id="@+id/register_choose_photo"
+ <ImageView
+ android:id="@+id/fragment_register_choose_photo"
android:layout_width="147dp"
android:layout_height="206dp"
android:background="@drawable/normal_choose_bcg"
- android:text="閫夋嫨浜虹墿蹇収"
- android:textSize="@dimen/text_size_normal"
- android:textColor="@android:color/white"
- android:gravity="center"/>-->
+ android:gravity="center"
+ />
<ImageView
- android:id="@+id/register_update__photo"
+ android:id="@+id/fragment_register_update_photo"
android:layout_width="147dp"
android:layout_height="206dp"
android:background="@drawable/normal_choose_bcg"
@@ -104,15 +83,12 @@
android:textSize="@dimen/text_size_normal"
android:textColor="@android:color/white"
android:gravity="center"/>
- <TextView
- android:id="@+id/register_idcard_photo"
+ <ImageView
+ android:id="@+id/fragment_register_id_card_photo"
android:layout_width="330dp"
android:layout_height="206dp"
android:background="@drawable/normal_choose_bcg"
- android:text="璇佷欢蹇収"
- android:textSize="@dimen/text_size_normal"
- android:textColor="@android:color/white"
- android:gravity="center"/>
+ />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -124,54 +100,72 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
-
- <include layout="@layout/fragment_register_right_field"
- android:id="@+id/register_name"
+ <cn.com.basic.face.widget.register.RegisterRightFieldTextView
+ android:id="@+id/fragment_register_name"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_label"
- android:id="@+id/register_gender"
+ android:layout_width="278dp"
+ register:label="@string/title_name"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldLabelView
+ android:id="@+id/fragment_register_gender"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_label"
- android:id="@+id/register_country"
+ android:layout_width="278dp"
+ register:label="@string/title_sex"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldLabelView
+ android:id="@+id/fragment_register_country"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_label"
- android:id="@+id/register_birthday"
+ android:layout_width="278dp"
+ register:label="@string/title_nation"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldLabelView
+ android:id="@+id/fragment_register_birthday"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_label"
- android:id="@+id/register_visitor_class"
+ android:layout_width="278dp"
+ register:label="@string/title_birthday"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldLabelView
+ android:id="@+id/fragment_register_visitor_class"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
+ android:layout_width="278dp"
+ register:label="@string/title_visitorClass"
+ />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="122dp"
android:orientation="vertical">
-
- <include layout="@layout/fragment_register_right_field"
- android:id="@+id/register_phone"
+ <cn.com.basic.face.widget.register.RegisterRightFieldTextView
+ android:id="@+id/fragment_register_phone"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_label"
- android:id="@+id/register_id_class"
+ android:layout_width="278dp"
+ register:label="@string/title_phone"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldLabelView
+ android:id="@+id/fragment_register_id_class"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_field"
- android:id="@+id/register_id_num"
+ android:layout_width="278dp"
+ register:label="@string/title_idClass"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldTextView
+ android:id="@+id/fragment_register_id_num"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_field"
- android:id="@+id/register_company"
+ android:layout_width="278dp"
+ register:label="@string/title_idNumber"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldTextView
+ android:id="@+id/fragment_register_company"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
- <include layout="@layout/fragment_register_right_field"
- android:id="@+id/register_remark"
+ android:layout_width="278dp"
+ register:label="@string/title_companyName"
+ />
+ <cn.com.basic.face.widget.register.RegisterRightFieldTextView
+ android:id="@+id/fragment_register_remark"
android:layout_height="wrap_content"
- android:layout_width="278dp"/>
+ android:layout_width="278dp"
+ register:label="@string/title_remark"
+ />
</LinearLayout>
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0