From eb83ed21a62022bab8a5b0b479893fc777e9eedc Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期二, 25 四月 2017 14:40:34 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml | 171 ++++-------------- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml | 2 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml | 171 ++++-------------- VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml | 158 ++-------------- 4 files changed, 109 insertions(+), 393 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml index f3b2cf0..d2e7f30 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml @@ -15,33 +15,6 @@ android:layout_height="76dp" android:gravity="right|center_vertical" android:orientation="horizontal"> - <TextView - android:id="@+id/fragment_device_right_delete" - android:layout_width="40dp" - android:layout_height="36dp" - android:gravity="center" - android:textColor="@android:color/white" - android:background="@drawable/u194" - android:text=""/> - <TextView - android:id="@+id/fragment_device_right_add" - android:layout_width="40dp" - android:layout_height="36dp" - android:gravity="center" - android:layout_marginLeft="10dp" - android:textColor="@android:color/white" - android:background="@drawable/u249" - android:text=""/> - <TextView - android:id="@+id/fragment_device_right_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/u208" - android:text=""/> </LinearLayout> <LinearLayout android:orientation="vertical" @@ -49,118 +22,58 @@ android:layout_height="wrap_content" > <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:paddingBottom="13dp" - android:gravity="center_horizontal" + android:layout_width="611dp" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + 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="鎽勫儚澶村悕绉�" + android:id="@+id/fragment_check_in_right_visitor_reason_text_view" + /> + <EditText + android:id="@+id/fragment_check_in_right_visitor_reason" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_navigation" - android:text="camer1" - android:gravity="left" - android:layout_gravity="left" - android:textColor="@color/colorPrimary"/> - </LinearLayout> - <Switch - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:checked="true" - /> - </LinearLayout> + android:background="@null" + android:layout_marginTop="15dp" + android:layout_marginBottom="12dp" + android:text="鎽勫儚澶�1" + android:textSize="@dimen/text_size_normal" + android:textColor="@color/colorText_b" + /> <View android:layout_width="match_parent" android:layout_height="@dimen/view_size_1" - android:background="@color/colorText_b" - android:layout_marginLeft="5dp"/> - </LinearLayout> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:gravity="center_horizontal" + android:background="@color/colorText_b"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/colorPrimary" + android:textStyle="bold" + android:layout_marginTop="20dp" + android:textSize="@dimen/text_size_big" + android:text="IP鍦板潃"/> + <EditText + android:id="@+id/fragment_check_in_right_remark" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_big" - android:text="閫夋嫨缃戠粶" - android:gravity="left" - android:layout_gravity="left" - android:textColor="@color/colorText_b" - /> - </LinearLayout> - </LinearLayout> - </LinearLayout> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:paddingBottom="13dp" - android:gravity="center_horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_big" - android:text="缃戠粶1" - android:gravity="left" - android:layout_gravity="left" - /> - </LinearLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u39" - /> - <TextView - android:layout_width="10dp" - android:layout_height="wrap_content" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u41" - /> - </LinearLayout> + android:background="@null" + android:layout_marginTop="15dp" + android:layout_marginBottom="12dp" + android:hint="" + android:textColorHint="@color/colorText_b" + android:textSize="@dimen/text_size_normal" + android:textColor="@color/colorText_b"/> <View android:layout_width="match_parent" android:layout_height="@dimen/view_size_1" - android:background="@color/colorText_b" - android:layout_marginLeft="5dp"/> + android:background="@color/colorText_b"/> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml index fac1415..198a242 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml @@ -15,33 +15,6 @@ android:layout_height="76dp" android:gravity="right|center_vertical" android:orientation="horizontal"> - <TextView - android:id="@+id/fragment_device_right_delete" - android:layout_width="40dp" - android:layout_height="36dp" - android:gravity="center" - android:textColor="@android:color/white" - android:background="@drawable/u194" - android:text=""/> - <TextView - android:id="@+id/fragment_device_right_add" - android:layout_width="40dp" - android:layout_height="36dp" - android:gravity="center" - android:layout_marginLeft="10dp" - android:textColor="@android:color/white" - android:background="@drawable/u249" - android:text=""/> - <TextView - android:id="@+id/fragment_device_right_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/u208" - android:text=""/> </LinearLayout> <LinearLayout android:orientation="vertical" @@ -49,118 +22,58 @@ android:layout_height="wrap_content" > <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:paddingBottom="13dp" - android:gravity="center_horizontal" + android:layout_width="611dp" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + 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="鎽勫儚澶村悕绉�" + android:id="@+id/fragment_check_in_right_visitor_reason_text_view" + /> + <EditText + android:id="@+id/fragment_check_in_right_visitor_reason" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_navigation" - android:text="camera2" - android:gravity="left" - android:layout_gravity="left" - android:textColor="@color/colorPrimary"/> - </LinearLayout> - <Switch - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:checked="true" - /> - </LinearLayout> + android:background="@null" + android:layout_marginTop="15dp" + android:layout_marginBottom="12dp" + android:text="鎽勫儚澶�2" + android:textSize="@dimen/text_size_normal" + android:textColor="@color/colorText_b" + /> <View android:layout_width="match_parent" android:layout_height="@dimen/view_size_1" - android:background="@color/colorText_b" - android:layout_marginLeft="5dp"/> - </LinearLayout> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:gravity="center_horizontal" + android:background="@color/colorText_b"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/colorPrimary" + android:textStyle="bold" + android:layout_marginTop="20dp" + android:textSize="@dimen/text_size_big" + android:text="IP鍦板潃"/> + <EditText + android:id="@+id/fragment_check_in_right_remark" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_big" - android:text="閫夋嫨缃戠粶" - android:gravity="left" - android:layout_gravity="left" - android:textColor="@color/colorText_b" - /> - </LinearLayout> - </LinearLayout> - </LinearLayout> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:paddingBottom="13dp" - android:gravity="center_horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_big" - android:text="缃戠粶1" - android:gravity="left" - android:layout_gravity="left" - /> - </LinearLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u39" - /> - <TextView - android:layout_width="10dp" - android:layout_height="wrap_content" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u41" - /> - </LinearLayout> + android:background="@null" + android:layout_marginTop="15dp" + android:layout_marginBottom="12dp" + android:hint="" + android:textColorHint="@color/colorText_b" + android:textSize="@dimen/text_size_normal" + android:textColor="@color/colorText_b"/> <View android:layout_width="match_parent" android:layout_height="@dimen/view_size_1" - android:background="@color/colorText_b" - android:layout_marginLeft="5dp"/> + android:background="@color/colorText_b"/> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml index d04585a..ed0599e 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml @@ -15,33 +15,6 @@ android:layout_height="76dp" android:gravity="right|center_vertical" android:orientation="horizontal"> - <TextView - android:id="@+id/fragment_device_right_delete" - android:layout_width="40dp" - android:layout_height="36dp" - android:gravity="center" - android:textColor="@android:color/white" - android:background="@drawable/u194" - android:text=""/> - <TextView - android:id="@+id/fragment_device_right_add" - android:layout_width="40dp" - android:layout_height="36dp" - android:gravity="center" - android:layout_marginLeft="10dp" - android:textColor="@android:color/white" - android:background="@drawable/u249" - android:text=""/> - <TextView - android:id="@+id/fragment_device_right_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/u208" - android:text=""/> </LinearLayout> <LinearLayout android:orientation="vertical" @@ -49,118 +22,35 @@ android:layout_height="wrap_content" > <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:paddingBottom="13dp" - android:gravity="center_horizontal" + android:layout_width="611dp" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + 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="瀛︽牎鍚嶇О" + android:id="@+id/fragment_check_in_right_visitor_reason_text_view" + /> + <EditText + android:id="@+id/fragment_check_in_right_visitor_reason" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_navigation" - android:text="school" - android:gravity="left" - android:layout_gravity="left" - android:textColor="@color/colorPrimary"/> - </LinearLayout> - <Switch - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:checked="true" - /> - </LinearLayout> + android:background="@null" + android:layout_marginTop="15dp" + android:layout_marginBottom="12dp" + android:text="鏈濋槼灏忓" + android:textSize="@dimen/text_size_normal" + android:textColor="@color/colorText_b" + /> <View android:layout_width="match_parent" android:layout_height="@dimen/view_size_1" - android:background="@color/colorText_b" - android:layout_marginLeft="5dp"/> - </LinearLayout> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:gravity="center_horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_big" - android:text="閫夋嫨缃戠粶" - android:gravity="left" - android:layout_gravity="left" - android:textColor="@color/colorText_b" - /> - </LinearLayout> - </LinearLayout> - </LinearLayout> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:paddingTop="13dp" - android:paddingBottom="13dp" - android:gravity="center_horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_weight="1" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="@dimen/text_size_big" - android:text="缃戠粶1" - android:gravity="left" - android:layout_gravity="left" - /> - </LinearLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u39" - /> - <TextView - android:layout_width="10dp" - android:layout_height="wrap_content" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u41" - /> - </LinearLayout> - <View - android:layout_width="match_parent" - android:layout_height="@dimen/view_size_1" - android:background="@color/colorText_b" - android:layout_marginLeft="5dp"/> + android:background="@color/colorText_b"/> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml index e25e11b..fd73119 100644 --- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml +++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_wifi.xml @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="@dimen/text_size_navigation" - android:text="wifi" + android:text="鏃犵嚎WIFI璁剧疆" android:gravity="left" android:layout_gravity="left" android:textColor="@color/colorPrimary"/> -- Gitblit v1.8.0