From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 14092fc..40cebb0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/WifiUtils.java
@@ -50,18 +50,17 @@
*
* @return 杩斿洖ssid鍚嶇О
*/
- public String getCurrentConnectWifiSsid() {
- WifiInfo wifiInfo = this.getCurrentConnectWifiInfo();
- return wifiInfo.getSSID().replace("\"", "");
- }
-
- /**
- * 鑾峰彇褰撳墠杩炴帴鐨剋ifi
- *
- * @return wifi淇℃伅
- */
- public WifiInfo getCurrentConnectWifiInfo() {
- return (mWifiManager == null) ? null : mWifiManager.getConnectionInfo();
+ public MyWifiInfo getCurrentConnectWifiInfo() {
+ if (mWifiManager == null) {
+ return new MyWifiInfo();
+ }
+ MyWifiInfo myWifiInfo = new MyWifiInfo();
+ try {
+ WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+ myWifiInfo.setSSID(wifiInfo.getSSID().replace("\"", ""));
+ } catch (Exception ignored) {
+ }
+ return myWifiInfo;
}
/**
--
Gitblit v1.8.0