From ff93094cd08e8486242e60e9f076ebfd66b83e9c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 31 三月 2017 17:23:59 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_register.xml |   74 +++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 28 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..e1d68a9 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"
@@ -49,7 +50,7 @@
                         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 +59,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 +71,6 @@
                 </LinearLayout>
             </RelativeLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
                 android:orientation="horizontal">
 
                 <com.facebook.drawee.view.SimpleDraweeView
-                    android:id="@+id/register_choose_photo"
+                    android:id="@+id/fragment_register_choose_photo"
                     android:layout_width="147dp"
                     android:layout_height="206dp"
                     android:gravity="center"
@@ -94,7 +94,7 @@
                     android:textColor="@android:color/white"
                     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"
@@ -105,7 +105,7 @@
                     android:textColor="@android:color/white"
                     android:gravity="center"/>
                 <TextView
-                    android:id="@+id/register_idcard_photo"
+                    android:id="@+id/fragment_register_idcard_photo"
                     android:layout_width="330dp"
                     android:layout_height="206dp"
                     android:background="@drawable/normal_choose_bcg"
@@ -124,54 +124,72 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
-
-                    <include layout="@layout/fragment_register_right_field"
+                    <cn.com.basic.face.widget.RegisterRightFieldTextView
                         android:id="@+id/register_name"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_label"
+                        android:layout_width="278dp"
+                        register:label="@string/title_name"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_gender"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_label"
+                        android:layout_width="278dp"
+                        register:label="@string/title_sex"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_country"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_label"
+                        android:layout_width="278dp"
+                        register:label="@string/title_nation"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_birthday"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_label"
+                        android:layout_width="278dp"
+                        register:label="@string/title_birthday"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/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"
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_phone"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_label"
+                        android:layout_width="278dp"
+                        register:label="@string/title_phone"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_id_class"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_field"
+                        android:layout_width="278dp"
+                        register:label="@string/title_idClass"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_id_num"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_field"
+                        android:layout_width="278dp"
+                        register:label="@string/title_idNumber"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_company"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/fragment_register_right_field"
+                        android:layout_width="278dp"
+                        register:label="@string/title_companyName"
+                        />
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/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