fix: wifi连接

app.yaml

@@ -1,6 +1,6 @@
 id: t11
 name: t11
-version: 2.15.15
+version: 2.15.16
 author: t11
 icon: ''
 desc: t11

network.py

@@ -624,16 +624,16 @@ class NetworkManager:
         password = inner_data.get("password")
         ota_res_url = inner_data.get("url")
         try:
-            w = network.wifi.Wifi()
-            e = w.connect(ssid, password, wait=True, timeout=15)
-            err.check_raise(e, "connect wifi failed")
+            ip, err = self.connect_wifi(ssid, password, persist=False, timeout_s=15, verify_host=None, verify_port=None)
+            if err:
+                raise RuntimeError(err)
             if self.logger:
-                self.logger.info(f"[ota] Connect success, got ip{w.get_ip()}")
+                self.logger.info(f"[ota] Connect success, got ip{ip}")
             self.safe_enqueue(
                 {
                     "cmd": 300,
                     "result": "ota start...",
-                    "wifi": w.get_ip(),
+                    "wifi": ip,
                 },
                 2,
             )
@@ -643,7 +643,7 @@ class NetworkManager:
                 {
                     "cmd": 300,
                     "result": "success",
-                    "wifi": w.get_ip(),
+                    "wifi": ip,
                 },
                 2,
             )
@@ -665,16 +665,16 @@ class NetworkManager:
         ssid = inner_data.get("ssid")
         password = inner_data.get("password")
         try:
-            w = network.wifi.Wifi()
-            e = w.connect(ssid, password, wait=True, timeout=15)
-            err.check_raise(e, "connect wifi failed")
+            ip, err = self.connect_wifi(ssid, password, persist=False, timeout_s=15, verify_host=None, verify_port=None)
+            if err:
+                raise RuntimeError(err)
             if self.logger:
-                self.logger.info(f"[ota] Connect success, got ip{w.get_ip()}")
+                self.logger.info(f"[conn wifi] Connect success, got ip{ip}")
             self.safe_enqueue(
                 {
                     "cmd": 600,
                     "result": "success",
-                    "wifi": w.get_ip(),
+                    "wifi": ip,
                 },
                 2,
             )

version.md

@@ -26,3 +26,4 @@
 # 2.15.13 优化算法
 # 2.15.14 优化算法
 # 2.15.15 优化wifi连接
+# 2.15.16 修复wifi连接问题

version.py

@@ -4,6 +4,6 @@
 应用版本号
 每次 OTA 更新时，只需要更新这个文件中的版本号
 """
-VERSION = '2.15.15'
+VERSION = '2.15.16'