From 233bc2ed60cb00b8ecde0034b5bf59f870af6440 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 17:56:59 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml | 164 ++++++++++++++++++++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/res/drawable/u194.png | 0
VisitFace/DemoForBsk/app/src/main/res/drawable/u39.png | 0
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 45 ++++++-----
VisitFace/DemoForBsk/app/src/main/res/drawable/u41.png | 0
5 files changed, 188 insertions(+), 21 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u194.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u194.png
new file mode 100644
index 0000000..78121a3
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u194.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u39.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u39.png
new file mode 100644
index 0000000..32b42a5
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u39.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u41.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u41.png
new file mode 100644
index 0000000..5824167
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u41.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
index ae3ee08..17c6435 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml
@@ -72,10 +72,6 @@
android:gravity="center_vertical"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
@@ -105,11 +101,14 @@
android:gravity="center_vertical"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
+
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="24dp"
+ />
</RelativeLayout>
<RelativeLayout
android:background="@android:color/white"
@@ -138,11 +137,13 @@
android:gravity="center_vertical"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="24dp"
+ />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
@@ -179,10 +180,6 @@
android:gravity="center_vertical"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
@@ -212,12 +209,20 @@
android:gravity="center_vertical"
android:textSize="@dimen/text_size_big"
android:textColor="@color/colorText_5"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/colorText_b"/>
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="24dp"
+ />
</RelativeLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/colorText_b"
+ android:layout_marginLeft="24dp"
+ />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
index fc0ef08..fd73119 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right.xml
@@ -2,5 +2,167 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
-
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+ <LinearLayout
+ android:layout_width="match_parent"
+ 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"
+ android:layout_width="596dp"
+ 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="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="鏃犵嚎WIFI璁剧疆"
+ 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>
+ <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"/>
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+ </ScrollView>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0