iotmanager/IoTManagerWeb
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManagerWeb.git synced 2026-03-26 15:02:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

callback

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-09-25 18:24:44 +02:00
parent dbb4a7d702
commit 5343baa75f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/App.svelte
View File

@@ -89,6 +89,7 @@
let scenarioJson = {}; let scenarioJson = {};
let chartJsonFlag = false; let chartJsonFlag = false;
let layoutJsonFlag = false;
//=============================================== //===============================================
let layoutJson = []; let layoutJson = [];
@@ -148,7 +149,7 @@
var layoutJsonBlobArray = []; var layoutJsonBlobArray = [];
class blobToJson { class blobToJson {
constructor(st, end, logMsg) { constructor(st, end, logMsg, cb) {
this.st = st; this.st = st;
this.end = end; this.end = end;
this.logMsg = logMsg; this.logMsg = logMsg;
@@ -157,6 +158,7 @@
this.blob = new MyBlobBuilder(); this.blob = new MyBlobBuilder();
this.out; this.out;
this.ws = 0; this.ws = 0;
this.cb = cb;
} }
handle(data) { handle(data) {
@@ -183,7 +185,8 @@
this.out = JSON.parse(result); this.out = JSON.parse(result);
if (debug) console.log("✔", this.logMsg + " blob parced"); if (debug) console.log("✔", this.logMsg + " blob parced");
this.parced = true; this.parced = true;
onParced(); //onParced();
this.cb;
} }
}; };
this.blob.clear(); this.blob.clear();
@@ -213,10 +216,10 @@
//} //}
} }
let configJsonPacket = new blobToJson("/st/config.json", "/end/config.json", "config.json"); let configJsonPacket = new blobToJson("/st/config.json", "/end/config.json", "config.json", onParced());
let itemsJsonPacket = new blobToJson("/st/items.json", "/end/items.json", "items.json"); let itemsJsonPacket = new blobToJson("/st/items.json", "/end/items.json", "items.json", onParced());
let widgetsJsonPacket = new blobToJson("/st/widgets.json", "/end/widgets.json", "widgets.json"); let widgetsJsonPacket = new blobToJson("/st/widgets.json", "/end/widgets.json", "widgets.json", onParced());
let scenarioJsonPacket = new blobToJson("/st/scenario.json", "/end/scenario.json", "scenario.json"); let scenarioJsonPacket = new blobToJson("/st/scenario.json", "/end/scenario.json", "scenario.json", onParced());
router.subscribe(handleNavigation); router.subscribe(handleNavigation);
@@ -432,8 +435,10 @@
} }
//сборщик layoutJson пакетов //сборщик layoutJson пакетов
if (data === "/st/layout.json") { if (data === "/st/layout.json") {
layoutJsonFlag = true;
} }
if (data === "/end/layout.json") { if (data === "/end/layout.json") {
layoutJsonFlag = false;
console.log("[1]", ws, "blob package received"); console.log("[1]", ws, "blob package received");
//как только прилетел весь блоб мы начнем его читать ридером и заодно запросим json-ы всех параметров //как только прилетел весь блоб мы начнем его читать ридером и заодно запросим json-ы всех параметров
combineLayoutsInOne(ws); combineLayoutsInOne(ws);
@@ -485,7 +490,7 @@
//принимаем данные от всех устройств //принимаем данные от всех устройств
if (chartJsonFlag) chartJsonBlob.append(event.data); if (chartJsonFlag) chartJsonBlob.append(event.data);
if (!layoutJsonBlobArray[ws]) layoutJsonBlobArray[ws] = new MyBlobBuilder(); if (!layoutJsonBlobArray[ws]) layoutJsonBlobArray[ws] = new MyBlobBuilder();
layoutJsonBlobArray[ws].append(event.data); if (layoutJsonFlag) layoutJsonBlobArray[ws].append(event.data);
} }
}); });
socket[ws].addEventListener("close", (event) => { socket[ws].addEventListener("close", (event) => {