From 771a848eea904046c68ffad084b5d68eadc9ebee Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 05 四月 2017 09:58:52 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_visit_right.xml | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 bc7c5ca..d0efc58 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
@@ -50,13 +50,29 @@
android:textSize="@dimen/text_size_big"
android:textStyle="bold"
android:text="@string/base_information"/>
- <include layout="@layout/fragment_visit_right_row"
+
+ <cn.com.basic.face.widget.VisitRightFormRow
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <!--<include layout="@layout/fragment_visit_right_form_row_left"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"/>
+ <include layout="@layout/fragment_visit_right_form_row_right"/>-->
+ </cn.com.basic.face.widget.VisitRightFormRow>
+<!--
+ <include layout="@layout/fragment_visit_right_form_row1">
+ <include layout="@layout/fragment_visit_right_form_row_left"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"/>
+ <include layout="@layout/fragment_visit_right_form_row_right"/>
+ </include>-->
+ <include layout="@layout/fragment_visit_right_form_row"
android:id="@+id/visitor_manager_row1"/>
- <include layout="@layout/fragment_visit_right_row"
+ <include layout="@layout/fragment_visit_right_form_row"
android:id="@+id/visitor_manager_row2"/>
- <include layout="@layout/fragment_visit_right_row"
+ <include layout="@layout/fragment_visit_right_form_row"
android:id="@+id/visitor_manager_row3"/>
- <include layout="@layout/fragment_visit_right_row"
+ <include layout="@layout/fragment_visit_right_form_row"
android:id="@+id/visitor_manager_row4"/>
<TextView
android:layout_width="wrap_content"
@@ -66,11 +82,11 @@
android:textStyle="bold"
android:layout_marginTop="28dp"
android:text="@string/visitor_information"/>
- <include layout="@layout/fragment_visit_right_row"
+ <include layout="@layout/fragment_visit_right_form_row"
android:id="@+id/visitor_manager_row5"/>
- <include layout="@layout/fragment_visit_right_row"
+ <include layout="@layout/fragment_visit_right_form_row"
android:id="@+id/visitor_manager_row6"/>
- <include layout="@layout/fragment_visit_right_row"
+ <include layout="@layout/fragment_visit_right_form_row"
android:id="@+id/visitor_manager_row7"/>
</LinearLayout>
</ScrollView>
--
Gitblit v1.8.0