From 68d19ec625e1ea8f568cf9007e6226988ec36062 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com> Date: Wed, 16 Feb 2022 00:11:57 +0100 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico | Bin 0 -> 1150 bytes public/favicon.png | Bin 3127 -> 0 bytes public/index.html | 4 +-- src/App.svelte | 55 +++++++++++++++------------------------- src/pages/Config.svelte | 4 ++- src/pages/List.svelte | 2 +- src/pages/System.svelte | 17 +++++++++++++ 7 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 public/favicon.ico delete mode 100644 public/favicon.png diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..50d908fa6d3f6f710e4d3d0f9fb3e96f3466895c GIT binary patch literal 1150 zcmbW1Yfy|)7{^~TzWHLtjL$y0jv2QSq6~#f#7e|agTf3mXcR503wx_}tj&marGz54 zp)gY^BiC^Wt!lJL)4EK`ZoB)w`*UPujO#dO{?9q*dFKC|=ltiKBS`~9A3RtRc9^to zpd<~IBx$&Sa0$;>zZfJ*#D)y|ioUfl{G$21UOX;0e!u@0(cimd!FyIyLs@Dnw)M$W zWSOWx{+QQIZWQ^?xfEHZ;dm*z5s_q04`x?j0BPgKvU5^6+K2)!nO@P=>HF>Gt+(%B zS`fpYX+i7`3KW=(I$$E|zzOUL4n`BQ7we`LoQ~d~a(G-W%F@!wnmwMJj9}N) z(SkpLjNoZxhlZdHn?vR-3q@NUq7Ls5IUEljVVoa^IcW?9DWf>FbtKkpQ^;STLNg@@ zZFo3Fajx9xc(UhS;fmRb?ES7seNizvag(v72T+(cp2OQlaqFUi_wDUilh=s-LoqE} zj9Ik=!+Zml_!l@HxcX|4eLl`;)Er5f$w}QDO0q&J%?!o)@=0IZ+15t>s+HtKMq!DK zMIV)mdC3cISU=!b{PgyG;zY^@%8V+`<;QW#FpsO&^~gR?{~4b*+(aL-2wh}0`sjO< ztn1*K{++lZ3hwS6$}_fbsW6GEV;eY=7e&K)v(QN9O|zTEnl36W?HFQikQZa8B&man z%}%Ow-{W;F_&h$Ui%nFQr&3$7gR}b=b70L;a#XGCjkJ>)*2KPf%^XnsnFYwabXMQrEL_f5PBv&r}|(Ez1?y@ zzo)B%`?VIq-^ay6%P_`gurtI?x`1YOGuo(T@>KW9PdLG4i;a)(I{Ud_CVszy!(L1M zc@33E*HWaOOWx}3=;L%4mTNGt-AKvqMDA7<;Och%!2PyR6d#?h8hKb}<@)LERM}Qh nS(rdwxtgZir|Ejz_D}E8uPAsuE6M9Ip6+){~bRA#ZfP9 literal 0 HcmV?d00001 diff --git a/public/favicon.png b/public/favicon.png deleted file mode 100644 index 7e6f5eb5a2f1f1c882d265cf479de25caa925645..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3127 zcmV-749N3|P)i z7)}s4L53SJCkR}iVi00SFk;`MXX*#X*kkwKs@nFGS}c;=?XFjU|G$3t^5sjIVS2G+ zw)WGF83CpoGXhLGW(1gW%uV|X7>1P6VhCX=Ux)Lb!*DZ%@I3!{Gsf7d?gtIQ%nQiK z3%(LUSkBji;C5Rfgd6$VsF@H`Pk@xtY6t<>FNR-pD}=C~$?)9pdm3XZ36N5PNWYjb z$xd$yNQR9N!dfj-Vd@BwQo^FIIWPPmT&sZyQ$v81(sCBV=PGy{0wltEjB%~h157*t zvbe_!{=I_783x!0t1-r#-d{Y?ae$Q4N_Nd^Ui^@y(%)Gjou6y<3^XJdu{rmUf-Me?)zZ>9OR&6U5H*cK; z$gUlB{g0O4gN0sLSO|Of?hU(l?;h(jA3uH!Z{EBKuV23ouU@^Y6#%v+QG;>e*E}%?wlu-NT4DG zs)z)7WbLr)vGAu(ohrKc^em@OpO&f~6_>E61n_e0_V3@{U3^O;j{`^mNCJUj_>;7v zsMs6Hu3g7+@v+lSo;=yTYFqq}jZmQ-BK8K{C4kqi_i*jBaQE(Au0607V-zKeT;EPg zX(`vrn=L+e74+-Tqeok@_`tDa$G9I|$nTU5H*2V8@y()n*zqM?J1G!-1aX;CfDC9B zTnJ#j_%*n8Qb1)re*Bno7g0RG{Eb;IK14irJYJp$5Z6ac9~b_P?+5t~95~SRG$g?1 znFJ7p$xV&GZ18m~79TGRdfsc-BcX$9yXTR*n)mPD@1~O(_?cT$ZvFPucRmGlq&se0 zKrcUf^k}4hM*biEJOWKzz!qQe;CB_ZtSOO9Owg#lZAc=s65^rb{fZe(TYu_rk!wKkEf}RIt=#Om( zR8mN`DM<^xj~59euMMspBolVN zAPTr8sSDI104orIAdmL$uOXn*6hga1G+0WD0E?UtabxC#VC~vf3|10|phW;yQ3CY8 z2CM=)ErF;xq-YJ5G|um}>*1#E+O_Mu|Nr#qQ&G1P-NMq@f?@*XUcSbV?tX=)ilM-Q zBZP|!Bpv0V;#ojKcpc7$=eqO;#Uy~#?^kNI{vSZfLx&DEt~LTmaKWXcx=joubklI<*Aw z>LtMaQ7DR<1I2LkWvwyu#Rwn~;ezT}_g(@5l3h?W%-a86Y-t#O1PubP+z<%?V5D(U zy57A6{h+{?kOZp7&WKZR+=sznMJ}+Dnpo=C_0%R_x_t~J5T?E_{+))l5v1%52>)d-`iiZyx|5!%M2Fb2dU zW3~MwwpEH9Rhue+k$UIOoo($Ds!NbOyMR36fRHu;*15(YcA7siIZk#%JWz>P!qX1?IUojG&nKR>^gArBt2 zit(ETyZ=@V&7mv_Fi4bABcnwP+jzQuHcfU&BrAV91u-rFvEi7y-KnWsvHH=d2 zgAk(GKm_S8RcTJ>2N3~&Hbwp{Z3NF_Xeh}g4Eke)V&dY{W(3&b1j9t4yK_aYJisZZ{1rcU5- z;eD>K;ndPq&B-8yA_S0F!4ThA&{1{x)H<#?k9a#6Pc6L?V^s0``ynL&D;p(!Nmx`Y zFkHex{4p!Ggm^@DlehW}iHHVi}~u=$&N? z(NEBLQ#UxxAkdW>X9LnqUr#t4Lu0=9L8&o>JsqTtT5|%gb3QA~hr0pED71+iFFr)dZ=Q=E6ng{NE{Z~0)C?deO#?Aj zSDQ$z#TeC2T^|=}6GBo-&$;E{HL3!q3Z-szuf)O=G#zDjin4SSP%o%6+2IT#sLjQa ziyxFFz~LMjWY+_a5H!U6%a<=b7QVP^ z*90a62;bVq{?@)P6^DWd^Yilq4|YTV2Nw!Yu;a1lPI-sxR)rf@Fe5DhDP7FH zZZ%4S*1C30P;|O+jB!1;m|rXT90Sm5*RBbQN`PKu+hDD*S^yE(CdtSfg=z>u$cIj> z - Svelte app + IoT Manager - + diff --git a/src/App.svelte b/src/App.svelte index d34fff6..ab4631e 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -23,7 +23,7 @@ //****************************************************constants section*********************************************************/ //******************************************************************************************************************************/ - let version = 403; + let version = 404; let debug = true; let LOG_MAX_MESSAGES = 10; let reconnectTimeout = 20000; @@ -33,8 +33,8 @@ //****************************************************variable section**********************************************************/ //******************************************************************************************************************************/ - let myip = document.location.hostname; - //let myip = "192.168.88.224"; + //let myip = document.location.hostname; + let myip = "192.168.88.224"; //Flags let firstDevListRequest = true; @@ -140,7 +140,6 @@ var widgetsJsonBlob = new MyBlobBuilder(); var itemsJsonBlob = new MyBlobBuilder(); var layoutJsonBlob = new MyBlobBuilder(); - var settingsJsonBlob = new MyBlobBuilder(); //var blobArr = new MyBlobBuilder()[10]; @@ -255,7 +254,8 @@ if (typeof event.data === "string") { let data = event.data; //if (debug) console.log("[i]", getIP(ws), "msg received", data); // - //принимаем данные только для выбранного устройства + + //STRING============================================================ if (ws === selectedWs) { //сборщик deviceList сообщений====================================== if (data.includes("devicelist")) { @@ -289,7 +289,6 @@ } } //сборщик paramsJson сообщений====================================== - //if (ws === 0) { if (data.includes("params")) { if (IsJsonParse(data)) { paramsJson = JSON.parse(data); @@ -298,7 +297,6 @@ onParced("params"); } } - //} //сборщик ssidJson сообщений====================================== if (data.includes("ssid")) { if (IsJsonParse(data)) { @@ -319,6 +317,19 @@ onParced("errors"); } } + //сборщик settingsJson сообщений====================================== + if (data.includes("settings")) { + if (IsJsonParse(data)) { + settingsJson = JSON.parse(data); + settingsJson = settingsJson; + wigetsUpdate(); + settingsJsonParced = true; + if (debug) console.log("✔", "settingsJson json parced"); + onParced("settings"); + } + } + + //BLOB============================================================== //сборщик configJson пакетов======================================== if (data === "/st/config.json") { configJsonFlag = true; @@ -380,7 +391,6 @@ }; } //сборщик layoutJson пакетов======================================== - //if (ws === 0) { if (data === "/st/layout.json") { layoutJsonFlag = true; } @@ -401,29 +411,6 @@ } }; } - //} - //сборщик settingsJson пакетов======================================== - if (data === "/st/settings.json") { - settingsJsonFlag = true; - } - if (data === "/end/settings.json") { - settingsJsonFlag = false; - var bb = settingsJsonBlob.getBlob(); - let settingsJsonReader = new FileReader(); - settingsJsonReader.readAsText(bb); - settingsJsonReader.onload = () => { - let settingsJsonResult = settingsJsonReader.result; - if (IsJsonParse(settingsJsonResult)) { - settingsJson = JSON.parse(settingsJsonResult); - settingsJson = settingsJson; - wigetsUpdate(); - //updateThisDeviceInList(); - settingsJsonParced = true; - if (debug) console.log("✔", "settingsJson parced"); - onParced("settings"); - } - }; - } } } if (event.data instanceof Blob) { @@ -433,7 +420,6 @@ if (widgetsJsonFlag) widgetsJsonBlob.append(event.data); if (itemsJsonFlag) itemsJsonBlob.append(event.data); if (layoutJsonFlag) layoutJsonBlob.append(event.data); - if (settingsJsonFlag) settingsJsonBlob.append(event.data); } } }); @@ -578,7 +564,6 @@ layoutJsonBlob.clear(); settingsJson = {}; - settingsJsonBlob.clear(); errorsJson = {}; @@ -1003,7 +988,7 @@ wsPush(ws, topic, status)} /> - saveConfig()} /> + saveConfig()} rebootEsp={() => rebootEsp()} /> rebootEsp()} ssidClick={() => ssidClick()} saveSett={() => saveSett()} saveMqtt={() => saveMqtt()} settingsJson={settingsJson} errorsJson={errorsJson} ssidJson={ssidJson} /> @@ -1055,7 +1040,7 @@ } /*=============================================card and items inside===============================================*/ .crd-itm-psn { - @apply flex mb-3 h-8 items-center; + @apply flex mb-2 h-8 items-center; } .wgt-dscr-stl { @apply pr-4 text-gray-500 font-bold; diff --git a/src/pages/Config.svelte b/src/pages/Config.svelte index 6be6c85..c2d5644 100644 --- a/src/pages/Config.svelte +++ b/src/pages/Config.svelte @@ -14,6 +14,7 @@ let debug = true; export let saveConfig = () => {}; + export let rebootEsp = () => {}; let hideAllSubParams = true; @@ -113,7 +114,8 @@ {/each} - + + {:else} diff --git a/src/pages/List.svelte b/src/pages/List.svelte index 8e434d4..df8e59d 100644 --- a/src/pages/List.svelte +++ b/src/pages/List.svelte @@ -66,7 +66,7 @@ -

Список устройств будет обновляться автоматически. Подключенные к одному роутеру устройства будут появляться в списке в течении двух минут. Ручное добавление сделано в целях проверки для разработчика.

+

Прошитые прошивкой IoT Manager устройства появятся в списке автоматически в течении минуты. Для обновления названий устройств нужно обновить страницу. Устройства должны быть подключены к одному wifi роутеру.

 {:else} diff --git a/src/pages/System.svelte b/src/pages/System.svelte index 3e7d8da..2795e58 100644 --- a/src/pages/System.svelte +++ b/src/pages/System.svelte @@ -121,6 +121,7 @@ import Card from "../components/Card.svelte"; import Alarm from "../components/Alarm.svelte"; export let version; + export let errorsJson; export let rebootEsp = () => {}; @@ -132,6 +133,14 @@ {#if show}
+
+
+

Название прошивки

+
+
+

{errorsJson.bn}

+
+

Версия прошивки

@@ -200,6 +209,14 @@

{errorsJson.heap}

+
+
+

Количество записей на flash

+
+
+

{errorsJson.fl}

+
+