From d83474582773ba7fa0993472329013471eadef22 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 17 四月 2017 17:13:37 +0800
Subject: [PATCH] update librtspface.so
---
VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
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 36deecc..51b2773 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
@@ -12,6 +12,7 @@
android:layout_centerVertical="true"
android:textColor="#8BD2F6"
/>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -47,13 +48,15 @@
<RelativeLayout
android:background="@android:color/white"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:id="@+id/fragment_device_left_wifi_relative_layout"
+ >
- <CheckBox
+ <RadioButton
android:id="@+id/fragment_device_left_wifi_check_box"
android:layout_centerVertical="true"
- android:clickable="false"
android:layout_marginLeft="24dp"
+ android:clickable="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
@@ -67,15 +70,11 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="鏃犵嚎WIFI璁剧疆"
- android:drawableLeft="@mipmap/ic_launcher"
+ android:drawableLeft="@drawable/u216"
android:drawablePadding="20dp"
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
@@ -83,10 +82,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <CheckBox
+ <RadioButton
android:id="@+id/fragment_device_left_lan_check_box"
android:layout_centerVertical="true"
- android:clickable="false"
android:layout_marginLeft="24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -101,26 +99,28 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="鏈夌嚎缃戠粶璁剧疆"
- android:drawableLeft="@mipmap/ic_launcher"
+ android:drawableLeft="@drawable/u222"
android:drawablePadding="20dp"
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"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <CheckBox
+ <RadioButton
android:id="@+id/fragment_device_left_school_check_box"
android:layout_centerVertical="true"
- android:clickable="false"
android:layout_marginLeft="24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -135,16 +135,18 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="鎵�灞炲鏍¤缃�"
- android:drawableLeft="@mipmap/ic_launcher"
+ android:drawableLeft="@drawable/u325"
android:drawablePadding="20dp"
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"
@@ -159,10 +161,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <CheckBox
+ <RadioButton
android:id="@+id/fragment_device_left_camera1_check_box"
android:layout_centerVertical="true"
- android:clickable="false"
android:layout_marginLeft="24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -177,15 +178,11 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="鎽勫儚鏈�1"
- android:drawableLeft="@mipmap/ic_launcher"
+ android:drawableLeft="@drawable/u251"
android:drawablePadding="20dp"
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
@@ -193,10 +190,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <CheckBox
+ <RadioButton
android:id="@+id/fragment_device_left_camera2_check_box"
android:layout_centerVertical="true"
- android:clickable="false"
android:layout_marginLeft="24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -211,17 +207,25 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="鎽勫儚鏈�2"
- android:drawableLeft="@mipmap/ic_launcher"
+ android:drawableLeft="@drawable/u233"
android:drawablePadding="20dp"
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
--
Gitblit v1.8.0