diff --git a/app/build.gradle b/app/build.gradle index d43f0e6..760da51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,9 @@ android { minSdkVersion 24 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.2" - // 2.0.8.2 修改网络连接证书设置 + versionName "V2.0.8.3" + // 2.0.8.2 修改网络连接证书设置、定时开关机设置 + // 2.0.8.3 获取mac修改 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java index d6a940d..bb9ca27 100644 --- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java +++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java @@ -190,7 +190,6 @@ public class MQTTService extends Service { if(!StringUtil.isEmpty(passWord)){ conOpt.setPassword(passWord.toCharArray()); //将字符串转换为字符串数组 } -// conOpt.setAutomaticReconnect(true); // last will message boolean doConnect = true; diff --git a/app/src/main/java/qianmu/container/util/DeviceUtil.java b/app/src/main/java/qianmu/container/util/DeviceUtil.java index bc09945..841484d 100644 --- a/app/src/main/java/qianmu/container/util/DeviceUtil.java +++ b/app/src/main/java/qianmu/container/util/DeviceUtil.java @@ -54,21 +54,19 @@ public class DeviceUtil { } return ip; }else { - String allIP = ""; for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements(); ) { NetworkInterface intf = en.nextElement(); for (Enumeration enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements(); ) { InetAddress inetAddress = enumIpAddr.nextElement(); - allIP += inetAddress.getHostAddress() + "\n"; - if (!inetAddress.isLoopbackAddress() && !inetAddress.isLinkLocalAddress()) + if (!inetAddress.isLoopbackAddress() && !inetAddress.isLinkLocalAddress() && inetAddress instanceof Inet4Address) { return inetAddress.getHostAddress(); + } } } } } catch (Throwable t) { LoggerUtil.e("getLocalIP", StringUtil.getThrowableStr(t)); } - return getLocalIPByWIFI(); } @@ -120,9 +118,10 @@ public class DeviceUtil { try { //获取wifi服务 WifiManager wifiManager = (WifiManager) MyApplication.getInstance().getApplicationContext().getSystemService(Context.WIFI_SERVICE); - //判断wifi是否开启 - if (!wifiManager.isWifiEnabled()) wifiManager.setWifiEnabled(true); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); + if (wifiInfo == null || wifiInfo.getIpAddress() == 0) { + return ""; + } int ipAddress = wifiInfo.getIpAddress(); ip = intToIp(ipAddress); } catch (Throwable t) {