From 512cae0fd797fac428f07d9d955f880e9ee353c1 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 30 七月 2020 19:45:01 +0800
Subject: [PATCH] 修改人脸显示
---
app/src/main/res/layout/fragment_setting.xml | 219 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 132 insertions(+), 87 deletions(-)
diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml
index a6e2950..dc13283 100644
--- a/app/src/main/res/layout/fragment_setting.xml
+++ b/app/src/main/res/layout/fragment_setting.xml
@@ -5,20 +5,25 @@
android:layout_height="match_parent"
android:id="@+id/fragment_setting"
>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
android:orientation="vertical">
<LinearLayout
- android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:orientation="horizontal">
+
<Space
android:layout_width="1dp"
android:layout_height="0dp"
- android:layout_weight="1"/>
+ android:layout_weight="1" />
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -53,10 +58,10 @@
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h32"
android:background="@drawable/spinner_arrow_down"
- android:dropDownSelector="@color/transparent"
android:dropDownVerticalOffset="0dp"
- android:paddingBottom="2dp"
+ android:dropDownSelector="@color/transparent"
android:paddingTop="2dp"
+ android:paddingBottom="2dp"
android:spinnerMode="dropdown" />
<TextView
@@ -87,12 +92,37 @@
android:layout_width="@dimen/w108"
android:layout_height="wrap_content"
android:gravity="right"
+ android:text="鏍囬锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/h13" />
+
+ <EditText
+ android:id="@+id/title"
+ android:layout_width="@dimen/w185"
+ android:layout_height="@dimen/h33"
+ android:background="@drawable/bg_edittext1"
+ android:paddingLeft="@dimen/w15"
+ android:singleLine="true"
+ android:textColor="@color/black"
+ android:textCursorDrawable="@null"
+ android:textSize="@dimen/h13" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/h24"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="@dimen/w108"
+ android:layout_height="wrap_content"
+ android:gravity="right"
android:text="IP锛�"
android:textColor="@color/black"
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/ip"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -100,6 +130,7 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@color/black"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
@@ -118,7 +149,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/port"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -126,6 +156,7 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@color/black"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
@@ -146,8 +177,8 @@
<TextView
android:layout_width="@dimen/w108"
- android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
android:gravity="right"
android:text="澹伴煶锛�"
android:textColor="@color/black"
@@ -158,10 +189,10 @@
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h32"
android:background="@drawable/spinner_arrow_down"
- android:dropDownSelector="@color/transparent"
android:dropDownVerticalOffset="0dp"
- android:paddingBottom="2dp"
+ android:dropDownSelector="@color/transparent"
android:paddingTop="2dp"
+ android:paddingBottom="2dp"
android:spinnerMode="dropdown" />
</LinearLayout>
@@ -195,10 +226,10 @@
android:layout_width="@dimen/w90"
android:layout_height="@dimen/h32"
android:background="@drawable/spinner_arrow_down"
- android:dropDownSelector="@color/transparent"
android:dropDownVerticalOffset="0dp"
- android:paddingBottom="2dp"
+ android:dropDownSelector="@color/transparent"
android:paddingTop="2dp"
+ android:paddingBottom="2dp"
android:spinnerMode="dropdown" />
<com.basic.security.widget.CustomSpinner
@@ -207,10 +238,10 @@
android:layout_height="@dimen/h32"
android:layout_marginLeft="@dimen/w6"
android:background="@drawable/spinner_arrow_down"
- android:dropDownSelector="@color/transparent"
android:dropDownVerticalOffset="0dp"
- android:paddingBottom="2dp"
+ android:dropDownSelector="@color/transparent"
android:paddingTop="2dp"
+ android:paddingBottom="2dp"
android:spinnerMode="dropdown" />
</LinearLayout>
@@ -239,7 +270,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/oldPassword"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -248,8 +278,10 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@color/black"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -265,7 +297,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/newPassword"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -274,8 +305,10 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@color/black"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -291,7 +324,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/newPassword2"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -300,26 +332,27 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@color/black"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
<TextView
- android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/w34"
android:layout_marginTop="@dimen/h63"
android:text="鎺堟潈"
android:textColor="@color/black"
- android:textSize="@dimen/h15" />
+ android:textSize="@dimen/h15"
+ android:visibility="gone" />
<LinearLayout
- android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/h24"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:visibility="gone">
<TextView
android:layout_width="@dimen/w108"
@@ -330,7 +363,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/password"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -339,6 +371,7 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@color/black"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
@@ -358,20 +391,22 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/confirmNewPassword"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
android:background="@drawable/bg_edittext1"
android:paddingLeft="@dimen/w15"
android:singleLine="true"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
</LinearLayout>
+
<Space
android:layout_width="1dp"
android:layout_height="0dp"
- android:layout_weight="1"/>
+ android:layout_weight="1" />
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -387,40 +422,42 @@
<CheckBox
android:id="@+id/switch_ethernet"
- android:layout_marginLeft="@dimen/w34"
- android:layout_marginTop="@dimen/h26"
style="@style/setting_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/w34"
+ android:layout_marginTop="@dimen/h26"
android:layout_marginRight="@dimen/w46"
android:text="浠ュお缃戝紑鍏�"
android:textColor="@color/black"
android:textSize="@dimen/h13" />
+
<RadioGroup
android:id="@+id/ip_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
+
<RadioButton
android:id="@+id/dhcp"
- android:layout_marginLeft="@dimen/w108"
- android:layout_marginTop="@dimen/h24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/w108"
+ android:layout_marginTop="@dimen/h24"
android:button="@drawable/radiobutton"
android:text="DHCP鑷姩鑾峰彇鍦板潃"
android:textColor="@color/black"
- android:textSize="@dimen/h13" />
+ android:textSize="@dimen/h13" />
<RadioButton
android:id="@+id/staticip"
- android:layout_marginLeft="@dimen/w108"
- android:layout_marginTop="@dimen/h24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/w108"
+ android:layout_marginTop="@dimen/h24"
android:button="@drawable/radiobutton"
android:text="鎵嬪姩璁剧疆濡備笅鍦板潃"
android:textColor="@color/black"
- android:textSize="@dimen/h13" />
+ android:textSize="@dimen/h13" />
</RadioGroup>
@@ -439,7 +476,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/ip_address"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -447,6 +483,7 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@drawable/bg_edittext1_color"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
@@ -465,7 +502,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/net_mask"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -473,6 +509,7 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@drawable/bg_edittext1_color"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
@@ -491,7 +528,6 @@
android:textSize="@dimen/h13" />
<EditText
- android:textCursorDrawable="@null"
android:id="@+id/gate_way"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
@@ -499,6 +535,7 @@
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@drawable/bg_edittext1_color"
+ android:textCursorDrawable="@null"
android:textSize="@dimen/h13" />
</LinearLayout>
@@ -518,74 +555,82 @@
<EditText
android:id="@+id/dns_server"
- android:textCursorDrawable="@null"
android:layout_width="@dimen/w185"
android:layout_height="@dimen/h33"
android:background="@drawable/bg_edittext1"
android:paddingLeft="@dimen/w15"
android:singleLine="true"
android:textColor="@drawable/bg_edittext1_color"
+ android:textCursorDrawable="@null"
+ android:textSize="@dimen/h13" />
+ </LinearLayout>
+
+
+ <Space
+ android:layout_width="1dp"
+ android:layout_height="0dp"
+ android:layout_weight="1" />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="@dimen/h266">
+
+ <Button
+ android:id="@+id/goto_home"
+ android:layout_width="@dimen/w65"
+ android:layout_height="@dimen/h40"
+ android:layout_gravity="center"
+ android:background="@drawable/white_button"
+ android:text="杩斿洖"
+ android:textColor="#222"
+ android:textSize="@dimen/h13" />
+
+ <Button
+ android:id="@+id/save"
+ android:layout_width="@dimen/w65"
+ android:layout_height="@dimen/h40"
+ android:layout_gravity="center"
+ android:layout_marginLeft="@dimen/w28"
+ android:background="@drawable/blue_button"
+ android:text="淇濆瓨"
+ android:textColor="@color/white"
+ android:textSize="@dimen/h13" />
+
+ <Button
+ android:id="@+id/exit"
+ android:layout_width="@dimen/w65"
+ android:layout_height="@dimen/h40"
+ android:layout_gravity="center"
+ android:layout_marginLeft="@dimen/w28"
+ android:background="@drawable/blue_button"
+ android:text="閫�鍑�"
+ android:textColor="@color/white"
+ android:textSize="@dimen/h13"
+ android:visibility="gone" />
+
+ <Button
+ android:id="@+id/open_system_setting"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:layout_marginLeft="@dimen/w28"
+ android:background="@drawable/white_button"
+ android:text="鎵撳紑绯荤粺璁剧疆"
+ android:textColor="#222"
android:textSize="@dimen/h13" />
</LinearLayout>
</LinearLayout>
- <Space
- android:layout_width="1dp"
- android:layout_height="0dp"
- android:layout_weight="1"/>
+
+
</LinearLayout>
+
<Space
android:layout_width="0dp"
android:layout_height="1dp"
- android:layout_weight="1"/>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/h66"
- android:layout_gravity="center_horizontal">
- <Button
- android:id="@+id/goto_home"
- android:layout_width="@dimen/w65"
- android:layout_height="@dimen/h40"
- android:textSize="@dimen/h13"
- android:textColor="#222"
- android:layout_gravity="center"
- android:background="@drawable/white_button"
- android:text="杩斿洖"/>
+ android:layout_weight="1" />
- <Button
- android:layout_marginLeft="@dimen/w28"
- android:id="@+id/save"
- android:layout_width="@dimen/w65"
- android:layout_height="@dimen/h40"
- android:textSize="@dimen/h13"
- android:textColor="@color/white"
- android:layout_gravity="center"
- android:background="@drawable/blue_button"
- android:text="淇濆瓨"/>
- <Button
- android:id="@+id/exit"
- android:layout_marginLeft="@dimen/w28"
- android:layout_width="@dimen/w65"
- android:layout_height="@dimen/h40"
- android:textSize="@dimen/h13"
- android:textColor="@color/white"
- android:layout_gravity="center"
- android:background="@drawable/blue_button"
- android:text="閫�鍑�"
- android:visibility="gone"
- />
- <Button
- android:layout_marginLeft="@dimen/w28"
- android:id="@+id/open_system_setting"
- android:layout_width="@dimen/w180"
- android:layout_height="@dimen/h40"
- android:textSize="@dimen/h13"
- android:textColor="#222"
- android:layout_gravity="center"
- android:background="@drawable/white_button"
- android:text="鎵撳紑绯荤粺璁剧疆"/>
- </LinearLayout>
</LinearLayout>
<TextView
--
Gitblit v1.8.0