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/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java b/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java
index 4f787be..9a925b2 100644
--- a/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java
+++ b/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java
@@ -7,6 +7,7 @@
import com.clj.fastble.data.ScanResult;
import com.moral.andbrickslib.baseadapter.recyclerview.CommonAdapter;
import com.moral.andbrickslib.baseadapter.recyclerview.base.ViewHolder;
+import com.moral.andbrickslib.utils.StringUtils;
import com.moral.yunfushao.R;
import java.util.List;
@@ -14,7 +15,6 @@
/**
* Created by haijiang on 2017/7/6.
*/
-
public class BleDeviceAdapter extends CommonAdapter<ScanResult> {
public BleDeviceAdapter(RecyclerView v, int layoutId, List<ScanResult> datas) {
super(v, layoutId, datas);
@@ -24,6 +24,10 @@
protected void convert(ViewHolder holder, ScanResult scanResult, int position) {
TextView tv_name = holder.getView(R.id.tv_name);
BluetoothDevice device = scanResult.getDevice();
- tv_name.setText(device.getName()+"\n"+device.getAddress());
+ if (!StringUtils.isEmpty(device.getName())) {
+ tv_name.setText(device.getName() + "\n" + device.getAddress());
+ } else {
+ tv_name.setText("������������" + "\n" + device.getAddress());
+ }
}
}
--
Gitblit v1.8.0