From efb0a278617bebbc184dec36c913f2ee1573598a Mon Sep 17 00:00:00 2001 From: huangxiang Date: Mon, 16 Oct 2023 09:34:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A2=91=E7=B9=81=E5=88=87=E6=8D=A2=E9=A3=9E?= =?UTF-8?q?=E8=A1=8C=E6=A8=A1=E5=BC=8F=E5=90=8E=E6=8E=A7=E5=88=B6=E4=B8=AD?= =?UTF-8?q?=E5=BF=83wlan=E7=8A=B6=E6=80=81=E4=B8=8E=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/default/wifiModel.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/features/wificomponent/src/main/ets/default/wifiModel.ts b/features/wificomponent/src/main/ets/default/wifiModel.ts index 310fd6e9..8957e4bf 100644 --- a/features/wificomponent/src/main/ets/default/wifiModel.ts +++ b/features/wificomponent/src/main/ets/default/wifiModel.ts @@ -70,13 +70,15 @@ export class WifiModel { onWifiStateChange(data: WifiState): void { Log.showInfo(TAG, `onWifiStateChange, data: ${JSON.stringify(data)}`); - - let isWifiInactive = data == WifiState.STATE_OFF; - mWifiOpenStatus.set(!isWifiInactive); - if (!isWifiInactive) { - this.getWifiConnectInfo(); - } else { - this.setDisconnectedStatus(); + if (data == WifiState.STATE_OFF || data == WifiState.STATE_ON) { + let checkState = wifi.isWifiActive(); + Log.showInfo(TAG, `checkState, data: ${JSON.stringify(checkState)}`); + mWifiOpenStatus.set(checkState); + if (checkState) { + this.getWifiConnectInfo(); + } else { + this.setDisconnectedStatus(); + } } } -- Gitee From fc770fce52241c452541dac6fc72a0646cc13c74 Mon Sep 17 00:00:00 2001 From: huangxiang Date: Mon, 16 Oct 2023 09:34:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A2=91=E7=B9=81=E5=88=87=E6=8D=A2=E9=A3=9E?= =?UTF-8?q?=E8=A1=8C=E6=A8=A1=E5=BC=8F=E5=90=8E=E6=8E=A7=E5=88=B6=E4=B8=AD?= =?UTF-8?q?=E5=BF=83wlan=E7=8A=B6=E6=80=81=E4=B8=8E=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huangxiang --- .../src/main/ets/default/wifiModel.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/features/wificomponent/src/main/ets/default/wifiModel.ts b/features/wificomponent/src/main/ets/default/wifiModel.ts index 310fd6e9..8957e4bf 100644 --- a/features/wificomponent/src/main/ets/default/wifiModel.ts +++ b/features/wificomponent/src/main/ets/default/wifiModel.ts @@ -70,13 +70,15 @@ export class WifiModel { onWifiStateChange(data: WifiState): void { Log.showInfo(TAG, `onWifiStateChange, data: ${JSON.stringify(data)}`); - - let isWifiInactive = data == WifiState.STATE_OFF; - mWifiOpenStatus.set(!isWifiInactive); - if (!isWifiInactive) { - this.getWifiConnectInfo(); - } else { - this.setDisconnectedStatus(); + if (data == WifiState.STATE_OFF || data == WifiState.STATE_ON) { + let checkState = wifi.isWifiActive(); + Log.showInfo(TAG, `checkState, data: ${JSON.stringify(checkState)}`); + mWifiOpenStatus.set(checkState); + if (checkState) { + this.getWifiConnectInfo(); + } else { + this.setDisconnectedStatus(); + } } } -- Gitee