From 75e83be13a8c4ccf081c4dc07a262e4096783c7e Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 02 Nov 2018 17:34:21 +0800
Subject: [PATCH] [*]修改电磁版本 配合电子修改bug
---
app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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..23260e7 100644
--- a/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java
+++ b/app/src/main/java/com/moral/yunfushao/adapter/BleDeviceAdapter.java
@@ -25,14 +25,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