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/list_item_voice.xml | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/layout/list_item_voice.xml b/app/src/main/res/layout/list_item_voice.xml
index 85de936..d3ef5ed 100644
--- a/app/src/main/res/layout/list_item_voice.xml
+++ b/app/src/main/res/layout/list_item_voice.xml
@@ -3,14 +3,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/x12">
- <TextView
- android:id="@+id/tv_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:layout_centerVertical="true"
- android:textColor="@color/dark_gray_txt"
- android:text="������"/>
<ImageView
android:id="@+id/iv_set"
android:layout_width="@dimen/x20"
@@ -18,7 +10,7 @@
android:padding="@dimen/x4"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
- android:src="@mipmap/icon_unset"/>
+ android:src="@mipmap/voiceset"/>
<ImageView
android:id="@+id/iv_play"
android:layout_width="@dimen/x20"
@@ -28,4 +20,25 @@
android:layout_toLeftOf="@+id/iv_set"
android:layout_marginRight="@dimen/x16"
android:src="@mipmap/icon_play"/>
+ <TextView
+ android:id="@+id/tv_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:layout_toLeftOf="@+id/iv_play"
+ android:textColor="@color/dark_gray_txt"
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:text="������"/>
+ <TextView
+ android:id="@+id/tv_sub_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ android:layout_toLeftOf="@+id/iv_play"
+ android:textColor="@color/gray_txt"
+ android:layout_below="@+id/tv_name"
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:text="������������"/>
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0