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

Дописываем логику работы с переменной timenow в сценариях. Теперь доступны выражения вида "timenow > 22:48 && timenow < 23:55 && btn = 1"

Browse Source
This commit is contained in:
biver
2021-12-19 23:08:14 +03:00
parent 3fc86fb173
commit 87191fa81b
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/Class/ScenarioClass3.h
View File

@@ -12,7 +12,7 @@ class Scenario {
} }
String allBlocks = scenario; String allBlocks = scenario;
allBlocks += "\n"; allBlocks += "\n";
String incommingEvent = selectToMarker(eventBuf, ","); String incommingEvent = selectToMarker(eventBuf, ",");
String incommingEventKey = selectToMarker(incommingEvent, " "); String incommingEventKey = selectToMarker(incommingEvent, " ");
@@ -164,11 +164,12 @@ class Scenario {
if (isEventExist(incommingEventKey, setEventKey)) { if (isEventExist(incommingEventKey, setEventKey)) {
String setEventSign; String setEventSign;
String setEventValue; String setEventValue;
if (type == 1) preCalculation(condition, setEventSign, setEventValue); if (type == 1) preCalculation(condition, setEventSign, incommingEventValue, setEventValue);
if (type == 2) preCalculationGisteresis(condition, setEventSign, setEventValue); if (type == 2) preCalculationGisteresis(condition, setEventSign, setEventValue);
if (isConditionMatch(setEventSign, incommingEventValue, setEventValue)) { if (isConditionMatch(setEventSign, incommingEventValue, setEventValue)) {
res = true; res = true;
} }
//SerialPrint("I", "incommingEventKey", incommingEventKey);
} }
return res; return res;
} }
@@ -178,8 +179,15 @@ class Scenario {
String setEventKey = selectFromMarkerToMarker(condition, " ", 0); String setEventKey = selectFromMarkerToMarker(condition, " ", 0);
String setEventSign; String setEventSign;
String setEventValue; String setEventValue;
preCalculation(condition, setEventSign, setEventValue); String jsonValue;
String jsonValue = getValue(setEventKey);
if (setEventKey == "timeNow") {
jsonValue = timeNow->getTimeWOsec();
} else {
jsonValue = getValue(setEventKey);
}
preCalculation(condition, setEventSign, jsonValue, setEventValue); //warning тут не уверен что jsonValue можно использовать
if (isConditionMatch(setEventSign, jsonValue, setEventValue)) { if (isConditionMatch(setEventSign, jsonValue, setEventValue)) {
res = true; res = true;
} }
@@ -200,11 +208,22 @@ class Scenario {
// return res; // return res;
//} //}
void preCalculation(String &condition, String &setEventSign, String &setEventValue) { void preCalculation(String &condition, String &setEventSign, String &incommingEventValue, String &setEventValue) {
setEventSign = selectFromMarkerToMarker(condition, " ", 1); setEventSign = selectFromMarkerToMarker(condition, " ", 1);
setEventValue = selectFromMarkerToMarker(condition, " ", 2); setEventValue = selectFromMarkerToMarker(condition, " ", 2);
if (!isDigitDotCommaStr(setEventValue)) { if (!isDigitDotCommaStr(setEventValue)) {
setEventValue = getValue(setEventValue); if (selectToMarker(incommingEventValue, ":") != "") {
int hhLStr = selectToMarker(incommingEventValue, ":").toInt();
int mmLStr = selectToMarkerLast(incommingEventValue, ":").toInt();
int hhRStr = selectToMarker(setEventValue, ":").toInt();
int mmRStr = selectToMarkerLast(setEventValue, ":").toInt();
incommingEventValue = hhLStr*60 + mmLStr;
setEventValue = hhRStr*60 + mmRStr;
} else {
setEventValue = getValue(setEventValue);
}
} }
} }
@@ -236,6 +255,7 @@ class Scenario {
bool isConditionMatch(String &setEventSign, String &incommingEventValue, String &setEventValue) { bool isConditionMatch(String &setEventSign, String &incommingEventValue, String &setEventValue) {
boolean flag = false; boolean flag = false;
if (setEventSign == "=") { if (setEventSign == "=") {
flag = incommingEventValue == setEventValue; flag = incommingEventValue == setEventValue;
} else if (setEventSign == "!=") { } else if (setEventSign == "!=") {
@@ -249,6 +269,7 @@ class Scenario {
} else if (setEventSign == "<=") { } else if (setEventSign == "<=") {
flag = incommingEventValue.toFloat() <= setEventValue.toFloat(); flag = incommingEventValue.toFloat() <= setEventValue.toFloat();
} }
return flag; return flag;
} }
}; };