From 3bd6e9023e011336da840e11a9d48bb31c7a0261 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 07 Nov 2018 09:31:59 +0800
Subject: [PATCH] [*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择

---
 app/src/main/res/layout/fragment_setting_layout.xml |   51 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/layout/fragment_setting_layout.xml b/app/src/main/res/layout/fragment_setting_layout.xml
index deb61da..65f653e 100644
--- a/app/src/main/res/layout/fragment_setting_layout.xml
+++ b/app/src/main/res/layout/fragment_setting_layout.xml
@@ -43,17 +43,19 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="������������"
             android:layout_alignParentRight="true"
-            android:textColor="@color/dark_gray_txt"
             android:drawableRight="@mipmap/icon_jiantou"
             android:drawablePadding="@dimen/x6"
+            android:text="������������"
+            android:textColor="@color/dark_gray_txt"
             android:textSize="16sp" />
     </RelativeLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/gray_line"/>
+        android:background="@color/gray_line" />
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -79,12 +81,14 @@
             android:id="@+id/sc_open"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"/>
+            android:layout_alignParentRight="true" />
     </RelativeLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/gray_line"/>
+        android:background="@color/gray_line" />
+
     <RelativeLayout
         android:id="@+id/rl_setvoice"
         android:layout_width="match_parent"
@@ -103,33 +107,39 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/x10"
             android:layout_toRightOf="@+id/iv3"
-            android:text="������������"
-            android:textColor="@color/dark_gray_txt"
             android:drawableRight="@mipmap/icon_jiantou"
+            android:text="���������������������"
+            android:textColor="@color/dark_gray_txt"
             android:textSize="16sp" />
-        <android.support.v7.widget.SwitchCompat
+
+        <Button
             android:id="@+id/sc_male"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/x20"
-            android:text="���"
+            android:layout_height="@dimen/x30"
+            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"/>
+            android:layout_marginRight="@dimen/x20"
+            android:background="@drawable/choose_button"
+            android:stateListAnimator="@anim/progress"
+            android:textColor="@color/dark_gray_txt"
+            android:text="������" />
     </RelativeLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/gray_line"/>
+        android:background="@color/gray_line" />
+
     <Button
         android:id="@+id/bt_sure"
         android:layout_width="match_parent"
         android:layout_height="@dimen/x40"
         android:layout_marginLeft="@dimen/x40"
-        android:layout_marginRight="@dimen/x40"
         android:layout_marginTop="@dimen/x24"
+        android:layout_marginRight="@dimen/x40"
         android:background="@mipmap/bt_blue"
-        android:text="������������"
         android:gravity="center"
+        android:text="������������"
         android:textColor="@color/white"
         android:textSize="16sp" />
 
@@ -138,20 +148,21 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/x40"
         android:layout_marginLeft="@dimen/x40"
-        android:layout_marginRight="@dimen/x40"
         android:layout_marginTop="@dimen/x24"
+        android:layout_marginRight="@dimen/x40"
         android:background="@mipmap/bt_blue"
-        android:text="������������"
-        android:visibility="gone"
         android:gravity="center"
+        android:text="������������"
         android:textColor="@color/white"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        android:visibility="gone" />
+
     <TextView
         android:id="@+id/tv_version"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center_horizontal|bottom"
         android:layout_marginBottom="30dp"
+        android:gravity="center_horizontal|bottom"
         android:text="������������V1.0"
         android:textColor="@color/dark_gray_txt"
         android:textSize="18sp" />

--
Gitblit v1.8.0