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_ble_search_layout.xml | 76 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/app/src/main/res/layout/ac_ble_search_layout.xml b/app/src/main/res/layout/ac_ble_search_layout.xml
index eba5f42..dc5a497 100644
--- a/app/src/main/res/layout/ac_ble_search_layout.xml
+++ b/app/src/main/res/layout/ac_ble_search_layout.xml
@@ -16,18 +16,20 @@
android:padding="@dimen/x16">
<ImageView
- android:id="@+id/iv_searchpic"
- android:layout_width="@dimen/x140"
- android:layout_height="@dimen/x140"
- android:scaleType="centerCrop"
- android:src="@mipmap/bg_start" />
-
- <ImageView
android:id="@+id/iv_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x8"
- android:src="@mipmap/bt_start" />
+ android:layout_marginBottom="@dimen/x10"
+ android:src="@mipmap/bt_start"
+ android:visibility="visible" />
+
+ <ImageView
+ android:id="@+id/iv_searchpic"
+ android:layout_width="@dimen/x70"
+ android:layout_height="@dimen/x70"
+ android:scaleType="centerCrop"
+ android:src="@mipmap/bg_start" />
</LinearLayout>
<LinearLayout
@@ -35,74 +37,84 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
+
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/x10"
- android:textColor="@color/dark_gray_txt"
- android:text="@string/caozuo"/>
+ android:text="@string/caozuo"
+ android:textColor="@color/dark_gray_txt" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/x10"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
+
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/x10"
- android:drawablePadding="@dimen/x8"
android:drawableLeft="@mipmap/icon1"
- android:textColor="@color/dark_gray_txt"
- android:text="@string/caozuo1"/>
+ android:drawablePadding="@dimen/x8"
+ android:padding="@dimen/x10"
+ android:text="@string/caozuo1"
+ android:textColor="@color/dark_gray_txt" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/x10"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
+
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/x10"
- android:drawablePadding="@dimen/x8"
android:drawableLeft="@mipmap/icon2"
- android:textColor="@color/dark_gray_txt"
- android:text="@string/caozuo2"/>
+ android:drawablePadding="@dimen/x8"
+ android:padding="@dimen/x10"
+ android:text="@string/caozuo2"
+ android:textColor="@color/dark_gray_txt" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/x10"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
+
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/x10"
- android:drawablePadding="@dimen/x8"
android:drawableLeft="@mipmap/icon3"
- android:textColor="@color/dark_gray_txt"
- android:text="@string/caozuo3"/>
+ android:drawablePadding="@dimen/x8"
+ android:padding="@dimen/x10"
+ android:text="@string/caozuo3"
+ android:textColor="@color/dark_gray_txt" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/x10"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
+
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="@dimen/x10"
- android:drawablePadding="@dimen/x8"
android:drawableLeft="@mipmap/icon4"
- android:textColor="@color/dark_gray_txt"
- android:text="@string/caozuo4"/>
+ android:drawablePadding="@dimen/x8"
+ android:padding="@dimen/x10"
+ android:text="@string/caozuo4"
+ android:textColor="@color/dark_gray_txt" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/x10"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_ble"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="gone"/>
+ android:visibility="gone" />
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0