From 68b40fc922178e0aeb3a916a1e769162c40dc985 Mon Sep 17 00:00:00 2001 From: zengfansheng Date: Sat, 11 Jun 2022 23:43:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96wifi=E6=88=96=E7=83=AD?= =?UTF-8?q?=E7=82=B9ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/build.gradle | 2 +- .../main/java/cn/wandersnail/commons/util/NetworkUtils.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 17b8cb4..ea4cc68 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'maven-publish' apply plugin: 'signing' -def lib_version = '1.3.4' +def lib_version = '1.3.5' def user_name = 'wandersnail' def lib_group = 'cn.wandersnail' def lib_artifact = 'commons-android' diff --git a/library/src/main/java/cn/wandersnail/commons/util/NetworkUtils.java b/library/src/main/java/cn/wandersnail/commons/util/NetworkUtils.java index 61767e9..df920ca 100644 --- a/library/src/main/java/cn/wandersnail/commons/util/NetworkUtils.java +++ b/library/src/main/java/cn/wandersnail/commons/util/NetworkUtils.java @@ -52,7 +52,9 @@ public static List getLocalNetInfos(@NonNull Context context) { WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE); while (en.hasMoreElements()) { NetworkInterface intf = en.nextElement(); - if ("eth0".equals(intf.getName().toLowerCase(Locale.ENGLISH)) || "wlan0".equals(intf.getName().toLowerCase(Locale.ENGLISH))) { + if ("eth0".equals(intf.getName().toLowerCase(Locale.ENGLISH)) || + "wlan1".equals(intf.getName().toLowerCase(Locale.ENGLISH)) || + "wlan0".equals(intf.getName().toLowerCase(Locale.ENGLISH))) { Enumeration enumIpAddr = intf.getInetAddresses(); while (enumIpAddr.hasMoreElements()) { InetAddress inetAddress = enumIpAddr.nextElement(); @@ -63,7 +65,7 @@ public static List getLocalNetInfos(@NonNull Context context) { info.ip = ipaddress; info.type = intf.getName().toLowerCase(Locale.ENGLISH); info.mac = StringUtils.toHex(intf.getHardwareAddress(), ":"); - if ("wlan0".equals(info.type)) { + if ("wlan0".equals(info.type) || "wlan1".equals(info.type)) { if (isCurrentNetworkWifi(context)) { int ipAddress = Objects.requireNonNull(wifiManager).getDhcpInfo().ipAddress; info.isWifi = info.ip.equals(toAddressString(ipAddress));