From e4cac5e0488b61f3e8d6802741cc0b1c11299554 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Mon, 26 Sep 2022 16:20:00 +0200
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B8=D0=B5=20?=
=?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/index.html | 6 ++---
src/App.svelte | 57 +++++++++++++++++++---------------------
src/widgets/Chart.svelte | 14 +++++-----
3 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/public/index.html b/public/index.html
index c0a9e9c..b036526 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,12 +4,12 @@
- IoT Manager 4.3.2
+ IoT Manager 4.3.4
-
+
-
+
diff --git a/src/App.svelte b/src/App.svelte
index 8fcddbb..3b052e7 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -208,10 +208,6 @@
append(data) {
if (this.flag) this.blob.append(data);
}
-
- //set setWs(ws) {
- // this.ws = ws;
- //}
}
let configJsonPacket = new blobToJson("/st/config.json", "/end/config.json", "config.json");
@@ -444,13 +440,11 @@
}
//сборщик chartJson пакетов
if (data.includes("/st/chart.json|")) {
- //let topic = deleteBeforeDelimiter(data, "|");
- //console.log("[i] chart", topic);
chartJsonFlag[ws] = true;
}
if (data.includes("/end/chart.json|")) {
- let topic = deleteBeforeDelimiter(data, "|");
- console.log("[i] chart", topic);
+ let json = JSON.parse(deleteBeforeDelimiter(data, "|"));
+ console.log("[i] chart blob", json.topic, json.maxCount);
chartJsonFlag[ws] = false;
var bb = chartJsonBlob.getBlob();
let chartJsonReader = new FileReader();
@@ -462,15 +456,24 @@
let arr = JSON.parse(chartJsonResult);
let status = {};
status.status = arr;
- status.topic = topic;
+ status.topic = json.topic;
+ status.maxCount = json.maxCount;
apdateWidgetByArray(status);
- if (debug) console.log("✔", "chartJson parced", status);
+ if (debug) console.log("✔ B", "chartJson parced", status);
}
};
chartJsonBlob.clear();
}
+ if (data.includes("/string/chart.json|")) {
+ let tmp = deleteBeforeDelimiter(data, "|");
+ if (IsJsonParse(tmp)) {
+ let json = JSON.parse(tmp);
+ console.log("✔ S", "chartJson parced");
+ apdateWidgetByArray(json);
+ }
+ }
//сборщик statusJson сообщений
- if (data.includes('"status"')) {
+ if (data.includes('"status"') && !data.includes("/string/chart.json|")) {
if (IsJsonParse(data)) {
let statusJson = JSON.parse(data);
if (Array.isArray(statusJson.status)) {
@@ -530,27 +533,21 @@
if (debug) console.log("✔✔", "config page parced");
}
- if (currentPageName === "/connection|") {
- if (parcedFlags.ssidJson && parcedFlags.settingsJson && parcedFlags.errorsJson) {
- clearParcedFlags();
- if (debug) console.log("✔✔", "connection page parced");
- pageReady.connection = true;
- }
+ if (currentPageName === "/connection|" && parcedFlags.ssidJson && parcedFlags.settingsJson && parcedFlags.errorsJson) {
+ clearParcedFlags();
+ if (debug) console.log("✔✔", "connection page parced");
+ pageReady.connection = true;
}
- if (currentPageName === "/list|") {
- if (parcedFlags.deviceListJson) {
- clearParcedFlags();
- if (debug) console.log("✔✔", "list page parced");
- pageReady.list = true;
- }
+ if (currentPageName === "/list|" && parcedFlags.deviceListJson) {
+ clearParcedFlags();
+ if (debug) console.log("✔✔", "list page parced");
+ pageReady.list = true;
}
- if (currentPageName === "/system|") {
- if (parcedFlags.errorsJson && parcedFlags.settingsJson) {
- clearParcedFlags();
- getVersionsList();
- if (debug) console.log("✔✔", "system page parced");
- pageReady.system = true;
- }
+ if (currentPageName === "/system|" && parcedFlags.errorsJson && parcedFlags.settingsJson) {
+ clearParcedFlags();
+ getVersionsList();
+ if (debug) console.log("✔✔", "system page parced");
+ pageReady.system = true;
}
if (currentPageName === "/dev|" && parcedFlags.errorsJson && parcedFlags.settingsJson && configJsonPacket.isParced && itemsJsonPacket.isParced) {
clearParcedFlags();
diff --git a/src/widgets/Chart.svelte b/src/widgets/Chart.svelte
index 5d778bc..2b2d488 100644
--- a/src/widgets/Chart.svelte
+++ b/src/widgets/Chart.svelte
@@ -41,14 +41,14 @@
//console.log("[i]", "=======================================================");
prevStatus = widget.status;
- for (let i = 0; i < widget.status.length; i++) {
- //if (i === 0 && widget.status[i].x === 0 && widget.status[i].y1 === 0) {
- // clearCart();
- // widget.status = [];
- // console.log("[i]", "clear cart data");
- // return;
- //}
+ if (widget.maxCount === 0) {
+ clearCart();
+ widget.status = [];
+ console.log("[i]", "clear cart data");
+ return;
+ }
+ for (let i = 0; i < widget.status.length; i++) {
if (i === 0) {
labels[i] = getDDMM(widget.status[i].x);
} else {