pref: wifi连接成功重新登录

app.yaml

@@ -1,6 +1,6 @@
 id: t11
 name: t11
-version: 2.15.16
+version: 2.15.18
 author: t11
 icon: ''
 desc: t11
@@ -18,8 +18,6 @@ files:
   - laser_manager.py
   - logger_manager.py
   - main.py
-  - model_270139.cvimodel
-  - model_270139.mud
   - network.py
   - ota_curl.sh
   - ota_manager.py

network.py

@@ -624,16 +624,21 @@ class NetworkManager:
         password = inner_data.get("password")
         ota_res_url = inner_data.get("url")
         try:
-            ip, err = self.connect_wifi(ssid, password, persist=False, timeout_s=15, verify_host=None, verify_port=None)
+            for _f in ("/etc/wpa_supplicant.conf", "/boot/wpa_supplicant.conf", "/boot/wifi.ssid", "/boot/wifi.pass"):
-            if err:
+                try:
-                raise RuntimeError(err)
+                    os.remove(_f)
+                except OSError:
+                    pass
+            w = network.wifi.Wifi()
+            e = w.connect(ssid, password, wait=True, timeout=15)
+            err.check_raise(e, "connect wifi failed")
             if self.logger:
-                self.logger.info(f"[ota] Connect success, got ip{ip}")
+                self.logger.info(f"[ota] Connect success, got ip{w.get_ip()}")
             self.safe_enqueue(
                 {
                     "cmd": 300,
                     "result": "ota start...",
-                    "wifi": ip,
+                    "wifi": w.get_ip(),
                 },
                 2,
             )
@@ -643,7 +648,7 @@ class NetworkManager:
                 {
                     "cmd": 300,
                     "result": "success",
-                    "wifi": ip,
+                    "wifi": w.get_ip(),
                 },
                 2,
             )
@@ -665,19 +670,29 @@ class NetworkManager:
         ssid = inner_data.get("ssid")
         password = inner_data.get("password")
         try:
-            ip, err = self.connect_wifi(ssid, password, persist=False, timeout_s=15, verify_host=None, verify_port=None)
+            for _f in ("/etc/wpa_supplicant.conf", "/boot/wpa_supplicant.conf", "/boot/wifi.ssid", "/boot/wifi.pass"):
-            if err:
+                try:
-                raise RuntimeError(err)
+                    os.remove(_f)
+                except OSError:
+                    pass
+            w = network.wifi.Wifi()
+            e = w.connect(ssid, password, wait=True, timeout=15)
+            err.check_raise(e, "connect wifi failed")
             if self.logger:
-                self.logger.info(f"[conn wifi] Connect success, got ip{ip}")
+                self.logger.info(f"[ota] Connect success, got ip{w.get_ip()}")
             self.safe_enqueue(
                 {
                     "cmd": 600,
                     "result": "success",
-                    "wifi": ip,
+                    "wifi": w.get_ip(),
                 },
                 2,
             )
+            self._session_force_4g = False
+            self.disconnect_server()
+            self._tcp_connected = False
+            self._network_type = None
+            self.logger.info("[conn wifi] WiFi已连接，等待主循环重新登录")
         except Exception as e:
             self.logger.error(f"cmd600 失败: {e}")
             self.safe_enqueue(

version.md

@@ -27,3 +27,5 @@
 # 2.15.14 优化算法
 # 2.15.15 优化wifi连接
 # 2.15.16 修复wifi连接问题
+# 2.15.17 修复wifi连接问题
+# 2.15.18 wifi连接成功重新登录

version.py

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