Skip to content
Snippets Groups Projects
Commit faa6fc41 authored by alfredo's avatar alfredo
Browse files

x api aggiunto controllo che evita di mandare 2 volte il messaggio

parent 65f65575
No related branches found
No related tags found
No related merge requests found
......@@ -179,10 +179,11 @@ class Antifurto {
const previousStatus = Antifurto.status;
if (fromServer || scenariPresent) {
Antifurto.showChangeAntifurtoStatus(previousStatus, newStatus, fromScenari, fromServer);
return;
}
// server set the status of the antitheft
Api.setAntifurtoStatus({ previousStatus, fromScenari, fromServer });
} else {
// server set the status of the antitheft
if(fromScenari === false)
Api.setAntifurtoStatus({ previousStatus, fromScenari, fromServer });
}
}
static showChangeAntifurtoStatus(previousStatus, newStatus, fromScenari = false, fromServer = false) {
......@@ -490,7 +491,6 @@ class Antifurto {
}
static updateConfiguration(conf) {
console.log(conf);
if(conf == null) return;
if(conf.outputSuono != null && conf.outputSuono != Antifurto.outputSuono.nome) {
Antifurto.updateOUTbtnAllarme(conf.outputSuono);
......
......@@ -411,11 +411,12 @@ class Scenari {
throw error;
}
}
if(antifurtoIsWorking || fromServer)
if(antifurtoIsWorking || fromServer){
Scenari.showChangeAntifurtoStatus(newStatus,fromServer);
else{
} else {
// server send click of IN0
Api.setAntifurtoStatus({ previousStatus: Scenari.antifurtoStatus, fromScenari:true, fromServer });
if(fromAntifurto === false)
Api.setAntifurtoStatus({ previousStatus: Scenari.antifurtoStatus, fromScenari:true, fromServer });
}
}
......@@ -722,7 +723,6 @@ class Scenari {
}
static updateConfiguration(conf) {
console.log(conf);
if (conf == null) return;
if (conf.learnINbtn != null && conf.learnINbtn != Scenari.learnINbtn.nome) {
Scenari.updateINbtnLearn(conf.learnINbtn);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment