From 20a08e9b61cd98ddea099c8d5345b95b2a130737 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Wed, 3 Jun 2026 16:47:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=99=84=E8=BF=91=E8=93=9D?=
 =?UTF-8?q?=E7=89=99=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ckkj/water/device/AddDeviceActivity.java  |  2 --
 .../water/device/AddDeviceActivity_copy.java  | 28 +++++++++++++++++--
 .../device/adapter/BleScanDeviceAdapter.java  |  3 +-
 .../main/res/layout/scan_ble_device_item.xml  |  1 +
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
index d55bdef..d53c8a9 100644
--- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
+++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity.java
@@ -75,7 +75,6 @@ public class AddDeviceActivity extends BaseActivity<AddDeviceLayoutBinding, Devi
                     if (animationDrawable.isRunning()) {
                         animationDrawable.stop();
                         viewBinding.ivScanAnimation.setVisibility(GONE);
-                        viewBinding.imgDeviceItem.setVisibility(VISIBLE);
                     }
                 }
             }
@@ -87,7 +86,6 @@ public class AddDeviceActivity extends BaseActivity<AddDeviceLayoutBinding, Devi
     private void initListener() {
         setClick(viewBinding.includedTitle.imgBack);
         setClick(viewBinding.tvScanAdd);
-        setClick(viewBinding.imgDeviceItem);
     }
 
     private void setClick(View view) {
diff --git a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
index d6b476d..cd0cbc1 100644
--- a/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
+++ b/app/src/main/java/com/ckkj/water/device/AddDeviceActivity_copy.java
@@ -16,6 +16,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ParcelUuid;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
@@ -25,6 +26,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ckkj.water.BuildConfig;
 import com.ckkj.water.ConstantUtil;
 import com.ckkj.water.R;
@@ -47,6 +49,7 @@ import com.maning.mlkitscanner.scan.callback.act.MNScanCallback;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -76,6 +79,7 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
     private boolean bluetoothReady = false;
     private BleScanDeviceAdapter bleAdapter;
     private List<WaterDeviceEntity> mDeviceList = new ArrayList<>();
+    private Set<String> discoveredMacSet = new HashSet<>();
 
     @Override
     public DevicePresenter createPresenter() {
@@ -148,17 +152,26 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
             @Override
             public void onScanResult(int callbackType, @NonNull ScanResult result) {
                 super.onScanResult(callbackType, result);
+                //Mac地址
+                String deviceAddress = result.getDevice().getAddress();
+                // 去重：已存在的设备不再添加
+                if (discoveredMacSet.contains(deviceAddress)) {
+                    return;
+                }
+                discoveredMacSet.add(deviceAddress);
+
                 WaterDeviceEntity bean = new WaterDeviceEntity();
                 //设备名字
                 String deviceName = result.getScanRecord() != null ?
                         result.getScanRecord().getDeviceName() : "无名称";
-                //Mac地址
-                String deviceAddress = result.getDevice().getAddress();
 
                 bean.setDeviceName(deviceName);
                 bean.setMacAddress(deviceAddress);
                 mDeviceList.add(bean);
                 bleAdapter.notifyItemInserted(mDeviceList.size() - 1);
+                if(bleAdapter.getItemCount() != 0){
+                    viewBinding.rvDevices.setVisibility(VISIBLE);
+                }
 
             }
 
@@ -242,6 +255,17 @@ public class AddDeviceActivity_copy extends BaseActivity<AddDeviceLayoutBinding,
         setClick(viewBinding.includedTitle.imgBack);
         setClick(viewBinding.tvScanAdd);
         setClick(viewBinding.btnBleScan);
+
+        if(bleAdapter != null){
+            bleAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+                @Override
+                public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                    ToastUtil.showShort(mContext, TextUtils.isEmpty(mDeviceList.get(position).getDeviceName()) ?
+                            "未知设备" : mDeviceList.get(position).getDeviceName());
+                    //TODO 准备连接设备，方案未定
+                }
+            });
+        }
     }
 
     private void setClick(View view) {
diff --git a/app/src/main/java/com/ckkj/water/device/adapter/BleScanDeviceAdapter.java b/app/src/main/java/com/ckkj/water/device/adapter/BleScanDeviceAdapter.java
index ed07e04..e574cb7 100644
--- a/app/src/main/java/com/ckkj/water/device/adapter/BleScanDeviceAdapter.java
+++ b/app/src/main/java/com/ckkj/water/device/adapter/BleScanDeviceAdapter.java
@@ -1,6 +1,7 @@
 package com.ckkj.water.device.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
@@ -25,6 +26,6 @@ public class BleScanDeviceAdapter extends BaseQuickAdapter<WaterDeviceEntity, Ba
 
     @Override
     protected void convert(BaseViewHolder helper, WaterDeviceEntity item) {
-        helper.setText(R.id.tv_device_name,item.getDeviceName());
+        helper.setText(R.id.tv_device_name, TextUtils.isEmpty(item.getDeviceName())? "未知设备" : item.getDeviceName());
     }
 }
diff --git a/app/src/main/res/layout/scan_ble_device_item.xml b/app/src/main/res/layout/scan_ble_device_item.xml
index ab491a2..f379ba6 100644
--- a/app/src/main/res/layout/scan_ble_device_item.xml
+++ b/app/src/main/res/layout/scan_ble_device_item.xml
@@ -17,6 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_5"
+        android:singleLine="true"
         android:text="设备名称"
         android:textColor="@color/textPrimaryColor"
         android:textSize="13sp"/>