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/ac_forget_password_layout.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/ac_forget_password_layout.xml b/app/src/main/res/layout/ac_forget_password_layout.xml
index 1ce1bf5..838f32c 100644
--- a/app/src/main/res/layout/ac_forget_password_layout.xml
+++ b/app/src/main/res/layout/ac_forget_password_layout.xml
@@ -43,7 +43,6 @@
             android:id="@+id/bt_code"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/x40"
-            android:layout_alignParentRight="true"
             android:textColor="@color/white"
             android:gravity="center"
             android:background="@mipmap/bt_red_small"
@@ -51,7 +50,10 @@
             android:paddingRight="@dimen/x8"
             android:paddingBottom="@dimen/x12"
             android:paddingTop="@dimen/x12"
-            android:text="���������������"/>
+            android:text="���������������"
+            android:layout_alignBaseline="@+id/et_code"
+            android:layout_alignBottom="@+id/et_code"
+            android:layout_alignParentEnd="true" />
         <EditText
             android:id="@+id/et_code"
             android:layout_width="match_parent"
@@ -129,7 +131,7 @@
         android:layout_marginLeft="@dimen/x16"
         android:layout_marginRight="@dimen/x16"
         android:layout_marginTop="@dimen/x20"
-        android:background="@mipmap/bt_red"
+        android:background="@mipmap/bt_blue"
         android:gravity="center"
         android:text="������"
         android:textColor="@color/white"

--
Gitblit v1.8.0