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

исправление бага ws

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-09-19 05:03:43 +02:00
parent d5fa083aba
commit 8ad11762e0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/App.svelte
View File

@@ -39,12 +39,12 @@
let updatingTimeout = 120000; let updatingTimeout = 120000;
let opened = false; let opened = false;
let preventMove = false; let preventMove = false;
let devMode = false; let devMode = true;
//****************************************************variable section**********************************************************/ //****************************************************variable section**********************************************************/
//******************************************************************************************************************************/ //******************************************************************************************************************************/
let myip = document.location.hostname; let myip = document.location.hostname;
if (devMode) myip = "192.168.1.116"; if (devMode) myip = "192.168.88.253";
//Flags //Flags
let firstDevListRequest = true; let firstDevListRequest = true;
@@ -517,6 +517,9 @@
reader.onload = () => { reader.onload = () => {
let devLayout = JSON.parse(reader.result); let devLayout = JSON.parse(reader.result);
for (let i = 0; i < devLayout.length; i++) {
devLayout[i].ws = ws;
}
layoutJson = layoutJson.concat(devLayout); layoutJson = layoutJson.concat(devLayout);
console.log("[2]", ws, "blob package pushed to layout"); console.log("[2]", ws, "blob package pushed to layout");
sortingLayout(); sortingLayout();
@@ -567,7 +570,7 @@
for (let i = 0; i < layoutJson.length; i++) { for (let i = 0; i < layoutJson.length; i++) {
let topic = layoutJson[i].topic; let topic = layoutJson[i].topic;
if (topic) { if (topic) {
layoutJson[i].ws = ws; //layoutJson[i].ws = ws;
topic = topic.substring(topic.lastIndexOf("/") + 1, topic.length); topic = topic.substring(topic.lastIndexOf("/") + 1, topic.length);
if (key === topic) { if (key === topic) {
console.log("[i]", "updated =>" + topic, value); console.log("[i]", "updated =>" + topic, value);
@@ -827,7 +830,7 @@
function wsPush(ws, topic, status) { function wsPush(ws, topic, status) {
let msg = topic + " " + status; let msg = topic + " " + status;
if (debug) console.log("[i]", "ws: ", ws, msg); if (debug) console.log("[i]", "ws: ", ws, msg);
layoutJson = layoutJson; //layoutJson = layoutJson;
let key = topic.substring(topic.lastIndexOf("/") + 1, topic.length); let key = topic.substring(topic.lastIndexOf("/") + 1, topic.length);
wsSendMsg(ws, "/control|" + key + "/" + status); wsSendMsg(ws, "/control|" + key + "/" + status);
} }