优化Wifi配置流程

app/src/main/java/com/bgycc/smartcanteen/command/WifiConfigCommandHandler.java

 package com.bgycc.smartcanteen.command;
 package com.bgycc.smartcanteen.command;
 
 
-import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiInfo;
 
 
 import com.bgycc.smartcanteen.entity.Command;
 import com.bgycc.smartcanteen.entity.Command;
 import com.bgycc.smartcanteen.entity.CommandResponse;
 import com.bgycc.smartcanteen.entity.CommandResponse;
 import com.bgycc.smartcanteen.entity.CommandWifiConfig;
 import com.bgycc.smartcanteen.entity.CommandWifiConfig;
-import com.bgycc.smartcanteen.utils.WifiHelper;
-import com.blankj.utilcode.util.LogUtils;
+import com.bgycc.smartcanteen.utils.NetworkUtils;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
 
 
-import static com.bgycc.smartcanteen.utils.SmartCanteenUtils.TAG;
-
 public class WifiConfigCommandHandler extends CommandHandler {
 public class WifiConfigCommandHandler extends CommandHandler {
     private static final long DEFAULT_DELAY = 3000;
     private static final long DEFAULT_DELAY = 3000;
-    private static final long CHECK_DELAY = 8000;
+    private static final long POLLING_DELAY = 100;
     private CommandWifiConfig wifiConfig;
     private CommandWifiConfig wifiConfig;
 
 
     public WifiConfigCommandHandler(Command command, Gson gson, CommandProgressCallback callback) {
     public WifiConfigCommandHandler(Command command, Gson gson, CommandProgressCallback callback) {
@@ -27,15 +23,9 @@ public class WifiConfigCommandHandler extends CommandHandler {
         CommandWifiConfig.CommandWifiConfigData data = wifiConfig.getData();
         CommandWifiConfig.CommandWifiConfigData data = wifiConfig.getData();
         if (data == null) return null;
         if (data == null) return null;
 
 
-        String ssid = data.getSsid();
-        String identity = data.getIdentity();
-        String pwd = data.getPwd();
-        String type = data.getType();
-        WifiHelper.connect(ssid, identity, pwd, type);
-
-        if (!WifiHelper.isWifiEnabled()) {
+        if (!NetworkUtils.isWifiEnabled()) {
             progress("正在启动Wifi", 5);
             progress("正在启动Wifi", 5);
-            if (!WifiHelper.setEnable(true)) {
+            if (!NetworkUtils.setEnable(true)) {
                 String failedMessage = "无法启动Wifi";
                 String failedMessage = "无法启动Wifi";
                 progress(failedMessage, 5);
                 progress(failedMessage, 5);
                 Thread.sleep(DEFAULT_DELAY);
                 Thread.sleep(DEFAULT_DELAY);
@@ -43,41 +33,30 @@ public class WifiConfigCommandHandler extends CommandHandler {
             }
             }
         }
         }
 
 
-        progress("正在配置Wifi", 10);
-        WifiConfiguration config = WifiHelper.createWifiConfiguration(ssid, identity, pwd, type);
-        if (config == null) {
-            String failedMessage = "Wifi参数有误";
-            progress(failedMessage, 10);
-            Thread.sleep(DEFAULT_DELAY);
-            return failed(failedMessage);
-        }
+        String ssid = data.getSsid();
+        String identity = data.getIdentity();
+        String pwd = data.getPwd();
+        String type = data.getType();
 
 
+        progress("正在配置Wifi", 10);
         try {
         try {
-            if (!WifiHelper.removeWifiConfiguration(ssid)) {
-                return failed("无法修改Wifi配置");
-            }
-            int netId = WifiHelper.addNetwork(config);
-            if (!WifiHelper.enableNetwork(netId)) {
-                return failed("无法应用Wifi配置");
+            NetworkUtils.connect(ssid, identity, pwd, type);
+            // 轮训检查wifi是否链接成功
+            for (int i = 0; i < 30; i++) {
+                Thread.sleep(POLLING_DELAY);
+                WifiInfo info = NetworkUtils.getWifiInfo();
+                if (info == null || info.getIpAddress() == 0) {
+                    continue;
+                }
+                String message = "Wifi配置成功";
+                progress(message, 50);
+                Thread.sleep(DEFAULT_DELAY);
+                return success(message);
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             Thread.sleep(DEFAULT_DELAY);
             Thread.sleep(DEFAULT_DELAY);
             return failed(e.getMessage());
             return failed(e.getMessage());
         }
         }
-
-        progress("正在连接Wifi", 20);
-        // 等待一段时间后检查是否连接成功
-        Thread.sleep(CHECK_DELAY);
-        WifiInfo info = WifiHelper.getWifiInfo();
-        if (info != null) {
-            LogUtils.d(TAG, "当前网络: " + info.getSSID() + " 目标网络: " + ssid);
-            if (info.getIpAddress() != 0) {
-                String successMessage = "Wifi已成功切换";
-                progress(successMessage, 50);
-                Thread.sleep(DEFAULT_DELAY);
-                return success(successMessage);
-            }
-        }
         return failed("无法连接Wifi");
         return failed("无法连接Wifi");
     }
     }
 }
 }