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 |  161 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 113 insertions(+), 48 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 96545ae..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,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/register_base"
+    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"
     android:layout_height="match_parent">
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -12,32 +15,76 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <LinearLayout
+
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="right"
-                android:layout_marginTop="10dp"
-                android:orientation="horizontal">
-                <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" />
-            </LinearLayout>
+                android:layout_height="50dp">
+                <TextView
+                    android:id="@+id/fragment_register_back"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:text="&lt; 浜哄憳娉ㄥ唽"
+                    android:layout_marginLeft="10dp"
+                    android:gravity="center_vertical"
+                    android:layout_centerVertical="true"
+                    android:textColor="#8BD2F6"
+                    />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:gravity="right"
+                    android:layout_marginTop="10dp"
+                    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/fragment_register_add"
+                        android:layout_width="40dp"
+                        android:layout_height="36dp"
+                        android:gravity="center"
+                        android:layout_marginLeft="10dp"
+                        android:textColor="@android:color/white"
+                        android:background="@drawable/main_btn_bcg"
+                        android:text="娣诲姞"/>
+                    <TextView
+                        android:id="@+id/fragment_register_save"
+                        android:layout_width="40dp"
+                        android:layout_height="36dp"
+                        android:gravity="center"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginRight="10dp"
+                        android:textColor="@android:color/white"
+                        android:background="@drawable/main_btn_bcg"
+                        android:text="淇濆瓨"/>
+                </LinearLayout>
+            </RelativeLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:gravity="center_horizontal"
                 android:orientation="horizontal">
-                <TextView
+
+                <com.facebook.drawee.view.SimpleDraweeView
+                    android:id="@+id/fragment_register_choose_photo"
+                    android:layout_width="147dp"
+                    android:layout_height="206dp"
+                    android:gravity="center"
+                    />
+                <!--<TextView
                     android:id="@+id/register_choose_photo"
                     android:layout_width="147dp"
                     android:layout_height="206dp"
@@ -45,24 +92,24 @@
                     android:text="閫夋嫨浜虹墿蹇収"
                     android:textSize="@dimen/text_size_normal"
                     android:textColor="@android:color/white"
-                    android:gravity="center"/>
-                <TextView
-                    android:id="@+id/register_update__photo"
+                    android:gravity="center"/>-->
+                <ImageView
+                    android:id="@+id/fragment_register_update__photo"
                     android:layout_width="147dp"
                     android:layout_height="206dp"
                     android:background="@drawable/normal_choose_bcg"
-                    android:text="閫夋嫨浜虹墿蹇収"
+                    android:text="鐐瑰嚮涓婁紶鐓х墖"
                     android:layout_marginLeft="44dp"
                     android:layout_marginRight="56dp"
                     android:textSize="@dimen/text_size_normal"
                     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"
-                    android:text="閫夋嫨浜虹墿蹇収"
+                    android:text="璇佷欢蹇収"
                     android:textSize="@dimen/text_size_normal"
                     android:textColor="@android:color/white"
                     android:gravity="center"/>
@@ -77,54 +124,72 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
-
-                    <include layout="@layout/registe_edittext"
+                    <cn.com.basic.face.widget.RegisterRightFieldTextView
                         android:id="@+id/register_name"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/register_textview"
+                        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/register_textview"
+                        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/register_textview"
+                        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/register_textview"
+                        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/registe_edittext"
+                    <cn.com.basic.face.widget.RegisterRightFieldLabelView
                         android:id="@+id/register_phone"
                         android:layout_height="wrap_content"
-                        android:layout_width="278dp"/>
-                    <include layout="@layout/register_textview"
+                        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/registe_edittext"
+                        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/registe_edittext"
+                        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/registe_edittext"
+                        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