From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 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