version:2.5

fix:增加根据类别显示标签,修改WiFi获取
update:
This commit is contained in:
2022-02-22 15:48:19 +08:00
parent 2230ea5161
commit 7e37ab1104
13 changed files with 78 additions and 46 deletions

View File

@@ -10,8 +10,6 @@ import android.util.Log;
import com.aoleyun.sn.bean.WiFiAlias;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.tencent.mmkv.MMKV;
@@ -195,7 +193,7 @@ public class WiFiUtils {
return;
}
for (WiFiAlias wiFiAlias : oldWiFiAlias) {
WifiConfiguration tempConfig = isExist(wiFiAlias.getWifi_name());
WifiConfiguration tempConfig = isExist(wiFiAlias.getName());
if (tempConfig != null) {
mWifiManager.removeNetwork(tempConfig.networkId);
}
@@ -222,17 +220,17 @@ public class WiFiUtils {
Log.e("comparedWiFiAlias", "addedWiFiAlias: " + addedWiFiAlias);
if (removedWiFiAlias.size() != 0) {
for (WiFiAlias alias : removedWiFiAlias) {
WifiConfiguration tempConfig = isExist(alias.getWifi_name());
WifiConfiguration tempConfig = isExist(alias.getName());
if (tempConfig != null) {
mWifiManager.removeNetwork(tempConfig.networkId);
Log.e("comparedWiFiAlias", "removedWiFiAlias: " + alias.getWifi_name());
Log.e("comparedWiFiAlias", "removedWiFiAlias: " + alias.getName());
}
}
}
Log.e("comparedWiFiAlias", "tempWiFiAlias: " + tempWiFiAlias);
if (addedWiFiAlias.size() != 0) {
for (WiFiAlias alias : tempWiFiAlias) {
if (!wifiSaved(alias.getWifi_name())) {
if (!wifiSaved(alias.getName())) {
addWiFiNetwork(alias);
}
}
@@ -246,10 +244,10 @@ public class WiFiUtils {
private static void addWiFiNetwork(WiFiAlias alias) {
int netId;
if (TextUtils.isEmpty(alias.getPassword())) {
netId = mWifiManager.addNetwork(getWifiConfig(alias.getWifi_name(), "", false));
if (TextUtils.isEmpty(alias.getPwd())) {
netId = mWifiManager.addNetwork(getWifiConfig(alias.getName(), "", false));
} else {
netId = mWifiManager.addNetwork(getWifiConfig(alias.getWifi_name(), alias.getPassword(), true));
netId = mWifiManager.addNetwork(getWifiConfig(alias.getName(), alias.getPwd(), true));
}
mWifiManager.enableNetwork(netId, true);
}