From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java
index 40cebb0..dd1c82d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java
@@ -10,12 +10,14 @@
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.SystemClock;
+import android.text.TextUtils;
import android.util.Log;
import androidx.core.app.ActivityCompat;
import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import java.util.ArrayList;
import java.util.List;
@@ -112,17 +114,45 @@
//鑾峰彇鎵弿缁撴灉
public List<ScanResult> getScanResult() {
- List<ScanResult> results = new ArrayList<>();
+ List<ScanResult> newResults = new ArrayList<>();
+
try {
if (mWifiManager != null) {
// mWifiManager.startScan();
// SystemClock.sleep(1000);
- results = mWifiManager.getScanResults();
+ List<ScanResult> results = mWifiManager.getScanResults();
+ for (int i = 0; i < results.size(); i++) {
+ ScanResult scanResult = results.get(i);
+ if (scanResult == null || TextUtils.isEmpty(scanResult.SSID)) {
+ continue;
+ }
+ if (!checkRepetition(newResults, scanResult)) {
+ //涓嶅瓨鍦ㄥ氨娣诲姞
+ newResults.add(scanResult);
+ }
+ }
+
}
} catch (Exception ex) {
- Log.d("WifiUtils", ex.getMessage());
+ HdlLogLogic.print("WifiUtils----->" + ex.getMessage(), false);
}
- return results;
+ return newResults;
+ }
+
+ /**
+ * 妫�鏌ュ垪琛ㄦ暟鎹槸鍚﹂噸澶�
+ *
+ * @param list 婧愬垪琛ㄦ暟鎹�
+ * @param scanResult 琚鏌ュ璞�
+ * @return true琛ㄧず瀛樺湪锛宖alse琛ㄧず涓嶅瓨鍦�
+ */
+ public boolean checkRepetition(List<ScanResult> list, ScanResult scanResult) {
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).SSID.equals(scanResult.SSID)) {
+ return true;
+ }
+ }
+ return false;
}
//鑾峰彇宸茬粡閰嶇疆濂界殑缃戠粶杩炴帴
--
Gitblit v1.8.0