From 84e391f79e4c298e31b990667a54d991d645949f Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 09:01:50 +0800
Subject: [PATCH] a
---
app/src/main/res/layout/fragment_base_setting.xml | 128 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 116 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/fragment_base_setting.xml b/app/src/main/res/layout/fragment_base_setting.xml
index 6ce6b84..1ef4a86 100644
--- a/app/src/main/res/layout/fragment_base_setting.xml
+++ b/app/src/main/res/layout/fragment_base_setting.xml
@@ -337,14 +337,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/w15"
- android:background="@drawable/identity_list_background"
+ android:background="@drawable/identity_list_background2"
android:gravity="center"
android:orientation="horizontal">
- <Spinner
+ <com.basic.security.widget.CustomSpinner
android:id="@+id/spinner"
android:layout_width="@dimen/w150"
- android:layout_height="@dimen/h45"
+ android:layout_height="@dimen/h47"
android:layout_marginLeft="@dimen/w10"
android:background="@drawable/spinner_arrow_down"
android:dropDownSelector="@color/transparent"
@@ -542,7 +542,99 @@
android:text="绉�" />
</LinearLayout>
+ <View style="@style/setting_line" />
+ <!--璁剧疆澶氬紶鍥剧墖杞挱-->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/w105"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <View style="@style/front_square" />
+
+
+ <CheckBox
+ android:id="@+id/reboot_hour_enable"
+ style="@style/setting_checkbox"
+ android:text=" 姣忓ぉ閲嶅惎" />
+
+
+ <TextView
+ android:layout_marginLeft="@dimen/w15"
+ style="@style/setting_text"
+ android:text="閲嶅惎鏃堕棿:" />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/w15"
+ android:background="@drawable/identity_list_background2"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <com.basic.security.widget.CustomSpinner
+ android:id="@+id/reboot_hour"
+ android:layout_width="@dimen/w100"
+ android:layout_height="@dimen/h47"
+ android:layout_marginLeft="@dimen/w10"
+ android:background="@drawable/spinner_arrow_down"
+ android:dropDownSelector="@color/transparent"
+ android:paddingTop="2dp"
+ android:paddingBottom="2dp"
+ android:spinnerMode="dropdown" />
+
+ </LinearLayout>
+
+ <TextView
+ style="@style/setting_text"
+ android:text="鐐�" />
+
+
+ </LinearLayout><View style="@style/setting_line" />
+
+ <!--璁剧疆澶氬紶鍥剧墖杞挱-->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/w105"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <View style="@style/front_square" />
+
+ <CheckBox
+ android:id="@+id/open_door_password_enable"
+ style="@style/setting_checkbox"
+ android:text=" 瀵嗙爜寮�闂�" />
+
+ <TextView
+ android:layout_marginLeft="@dimen/w15"
+ style="@style/setting_text"
+ android:text="瀵嗙爜:" />
+ <EditText
+ android:layout_marginLeft="@dimen/w6"
+ android:layout_width="@dimen/w300"
+ android:id="@+id/open_door_password"
+ style="@style/setting_edit_text"
+ android:text="" />
+
+
+ </LinearLayout>
+ <View style="@style/setting_line" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/w105"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <View style="@style/front_square" />
+
+ <CheckBox
+ android:id="@+id/normally_closed"
+ style="@style/setting_checkbox"
+ android:text=" 甯搁棴" />
+
+ </LinearLayout>
<View style="@style/setting_line" />
<!--璁剧疆澶氬紶鍥剧墖杞挱-->
@@ -701,6 +793,7 @@
<!-- 璁惧鐓х墖鏃嬭浆瑙掑害-->
<LinearLayout
+ android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="@dimen/w105"
android:gravity="center_vertical"
@@ -724,22 +817,33 @@
</LinearLayout>
- <View style="@style/setting_line" />
+ <View style="@style/setting_line" android:visibility="gone" />
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />
- <Button
- android:visibility="visible"
- android:id="@+id/setting_btn_save"
- style="@style/setting_button"
- android:layout_width="@dimen/w156"
- android:layout_height="@dimen/h60"
- android:layout_marginBottom="@dimen/h35"
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/w60"
android:layout_marginTop="@dimen/h35"
- android:text="淇濆瓨" />
+ android:gravity="center_horizontal">
+
+ <Button
+ android:id="@+id/setting_btn_save"
+ style="@style/setting_button"
+ android:layout_width="@dimen/w156"
+ android:layout_height="@dimen/h60"
+ android:text="淇濆瓨" />
+ <Button
+ android:id="@+id/open_system_setting"
+ style="@style/setting_button"
+ android:layout_width="@dimen/w156"
+ android:layout_height="@dimen/h60"
+ android:text="鎵撳紑绯荤粺璁剧疆" />
+ </LinearLayout>
</LinearLayout>
</ScrollView>
--
Gitblit v1.8.0