From 47f5d71a81a528aff225805d28bf181ce4d6f55d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 15 Nov 2018 13:14:43 +0800
Subject: [PATCH] [*]1.0.3.2版本
---
app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 326e8f5..9a925b2 100644
--- a/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java
+++ b/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java
@@ -15,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);
@@ -25,14 +24,10 @@
protected void convert(ViewHolder holder, ScanResult scanResult, int position) {
TextView tv_name = holder.getView(R.id.tv_name);
BluetoothDevice device = scanResult.getDevice();
- if(!StringUtils.isEmpty(device.getName())){
- if(device.getName().contains("7drlb")){
- tv_name.setText("���������"+"\n"+device.getAddress());
- }else{
- tv_name.setText(device.getName()+"\n"+device.getAddress());
- }
- }else{
- tv_name.setText("������������"+"\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