From 93dfa8ee834c7f8f56a3e609c36f551f7bdd2111 Mon Sep 17 00:00:00 2001
From: DmitriyTychina <dmitriy.tychina@gmail.com>
Date: Sun, 3 Sep 2023 19:33:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D1=83=D0=B5=D0=BC=20=D0=B2=D0=B5=D0=B7=D0=B4=D0=B5=20isNetwork?=
 =?UTF-8?q?Active()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MqttClient.cpp                              | 2 +-
 src/modules/exec/HttpGet/HttpGet.cpp            | 2 +-
 src/modules/exec/TelegramLT/TelegramLT.cpp      | 2 +-
 src/modules/virtual/GoogleSheet/GoogleSheet.cpp | 4 ++--
 src/modules/virtual/Weather/Weather.cpp         | 2 +-
 src/utils/Statistic.cpp                         | 2 +-
 src/utils/WiFiUtils.cpp                         | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/MqttClient.cpp b/src/MqttClient.cpp
index 4324e7c1..53e2fa5a 100644
--- a/src/MqttClient.cpp
+++ b/src/MqttClient.cpp
@@ -5,7 +5,7 @@ void mqttInit() {
     ts.add(
         WIFI_MQTT_CONNECTION_CHECK, MQTT_RECONNECT_INTERVAL,
         [&](void*) {
-            if (WiFi.status() == WL_CONNECTED) {
+            if (isNetworkActive()) {
                 SerialPrint("i", F("WIFI"), "http://" + jsonReadStr(settingsFlashJson, F("ip")));
                 wifiUptimeCalc();
                 if (mqtt.connected()) {
diff --git a/src/modules/exec/HttpGet/HttpGet.cpp b/src/modules/exec/HttpGet/HttpGet.cpp
index 8c53c10c..180d9099 100644
--- a/src/modules/exec/HttpGet/HttpGet.cpp
+++ b/src/modules/exec/HttpGet/HttpGet.cpp
@@ -10,7 +10,7 @@ public:
 
     void sendHttpPOST(String url, String msg)
     {
-        if (WiFi.status() == WL_CONNECTED)
+        if (isNetworkActive())
         {
 
             WiFiClient client;
diff --git a/src/modules/exec/TelegramLT/TelegramLT.cpp b/src/modules/exec/TelegramLT/TelegramLT.cpp
index 2fb3c14a..eee738e0 100644
--- a/src/modules/exec/TelegramLT/TelegramLT.cpp
+++ b/src/modules/exec/TelegramLT/TelegramLT.cpp
@@ -13,7 +13,7 @@ class TelegramLT : public IoTItem {
     }
 
     void sendTelegramMsg(bool often, String msg) {
-        if (WiFi.status() == WL_CONNECTED && (often || !often && _prevMsg != msg)) {
+        if (isNetworkActive() && (often || !often && _prevMsg != msg)) {
             WiFiClient client;
             HTTPClient http;
             http.begin(client, "http://live-control.com/iotm/telegram.php");
diff --git a/src/modules/virtual/GoogleSheet/GoogleSheet.cpp b/src/modules/virtual/GoogleSheet/GoogleSheet.cpp
index 173cfe13..e04b468e 100644
--- a/src/modules/virtual/GoogleSheet/GoogleSheet.cpp
+++ b/src/modules/virtual/GoogleSheet/GoogleSheet.cpp
@@ -31,7 +31,7 @@ public:
 
   void doByInterval()
   {
-    if (WiFi.status() == WL_CONNECTED)
+    if (isNetworkActive())
     {
       String value = getItemValue(logid);
       if (value != "")
@@ -55,7 +55,7 @@ public:
 
   IoTValue execute(String command, std::vector<IoTValue> &param)
   {
-    if (WiFi.status() == WL_CONNECTED)
+    if (isNetworkActive())
     {
       if (command == F("logGoogle"))
       { // Логирование определенного элемента по его идентификатору в GoogleSheet
diff --git a/src/modules/virtual/Weather/Weather.cpp b/src/modules/virtual/Weather/Weather.cpp
index 2ff85df4..2e39d8c7 100644
--- a/src/modules/virtual/Weather/Weather.cpp
+++ b/src/modules/virtual/Weather/Weather.cpp
@@ -26,7 +26,7 @@ public:
     {
         String ret;
 
-        if (WiFi.status() == WL_CONNECTED)
+        if (isNetworkActive())
         {
             // char c;
             String payload;
diff --git a/src/utils/Statistic.cpp b/src/utils/Statistic.cpp
index 621e1de5..88f4f1e1 100644
--- a/src/utils/Statistic.cpp
+++ b/src/utils/Statistic.cpp
@@ -20,7 +20,7 @@ void updateDeviceStatus() {
     // jsonRead(settingsFlashJson, F("serverip"), serverIP);
     String url = serverIP + F("/projects/esprebootstat.php");
     // SerialPrint("i", "Stat", "url " + url);
-    if ((WiFi.status() == WL_CONNECTED)) {
+    if ((isNetworkActive())) {
         WiFiClient client;
         HTTPClient http;
         http.begin(client, url);
diff --git a/src/utils/WiFiUtils.cpp b/src/utils/WiFiUtils.cpp
index 681d2c8a..00de872a 100644
--- a/src/utils/WiFiUtils.cpp
+++ b/src/utils/WiFiUtils.cpp
@@ -121,7 +121,7 @@ boolean RouterFind(String ssid) {
 
 uint8_t RSSIquality() {
     uint8_t res = 0;
-    if (WiFi.status() == WL_CONNECTED) {
+    if (isNetworkActive()) {
         int rssi = WiFi.RSSI();
         if (rssi >= -50) {
             res = 6;  //"Excellent";