From ef13ff6a2b9147343b7848979fa0911f8e750906 Mon Sep 17 00:00:00 2001 From: chenlimao Date: Wed, 1 Jul 2026 15:56:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dwifi=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=B6=85=E6=97=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ota-wifi.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/ota-wifi.vue b/src/pages/ota-wifi.vue index 7ab23e8..c0d7f98 100644 --- a/src/pages/ota-wifi.vue +++ b/src/pages/ota-wifi.vue @@ -273,11 +273,16 @@ const cancelWifiConnectPolling = () => { uni.hideLoading(); }; -// 判断设备在线且已连 WiFi;online:true + netType:"4g" 表示设备已切网但 WiFi 连接失败。 +// 判断设备电量接口返回的 online/netType 字段,确定设备是否已通过 WiFi 在线。 +// 返回值含义:true → WiFi 在线成功;"net_fail" → 设备走 4g 失败;false → 未就绪,需继续轮询。 const isDeviceConnectedByWifi = (deviceStatus) => { + // online 不为 true → 设备不在线,需继续轮询 if (deviceStatus?.online !== true) return false; const netType = String(deviceStatus?.netType || "").toLowerCase(); + // online:true + netType:4g → 设备已切 4g,WiFi 连接失败 if (netType === "4g") return "net_fail"; + // online:true + netType:wifi → WiFi 连接成功 + // online:true + netType:"" → 设备在线但 netType 暂未上报,继续轮询等待 return netType === "wifi"; };