iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 14:42:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Оптимизируем работу с функциями чтения JSON

Browse Source
This commit is contained in:
biver
2022-10-29 19:57:09 +03:00
parent 7dc21ee914
commit 4ddbd97999
1 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/utils/JsonUtils.cpp
View File

@@ -12,108 +12,82 @@ void jsonWriteStrDoc(DynamicJsonDocument& doc, String name, String value) {
// new==============================================================================
bool jsonRead(const String& json, String key, unsigned long& value, bool e) {
bool ret = true;
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
DeserializationError error = deserializeJson(doc, json);
if (error) {
if (e) {
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
}
ret = false;
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
return false;
} else if (!doc.containsKey(key)) {
if (e) {
SerialPrint("EE", F("jsonRead"), "json key '" + key + "' missing");
SerialPrint("EE", F("jsonRead"), key + " missing");
jsonErrorDetected();
}
ret = false;
return false;
}
value = doc[key].as<unsigned long>();
return ret;
return true;
}
bool jsonRead(const String& json, String key, float& value, bool e) {
bool ret = true;
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
DeserializationError error = deserializeJson(doc, json);
if (error) {
if (e) {
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
}
ret = false;
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
return false;
} else if (!doc.containsKey(key)) {
if (e) {
SerialPrint("EE", F("jsonRead"), key + " missing");
jsonErrorDetected();
}
ret = false;
return false;
}
value = doc[key].as<float>();
return ret;
return true;
}
bool jsonRead(const String& json, String key, String& value, bool e) {
bool ret = true;
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
DeserializationError error = deserializeJson(doc, json);
if (error) {
if (e) {
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
}
ret = false;
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
return false;
} else if (!doc.containsKey(key)) {
if (e) {
SerialPrint("EE", F("jsonRead"), key + " missing");
jsonErrorDetected();
}
ret = false;
return false;
}
value = doc[key].as<String>();
return ret;
return true;
}
bool jsonRead(const String& json, String key, bool& value, bool e) {
bool ret = true;
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
DeserializationError error = deserializeJson(doc, json);
if (error) {
if (e) {
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
}
ret = false;
} else if (!doc.containsKey(key)) {
if (e) {
SerialPrint("EE", F("jsonRead"), key + " missing");
jsonErrorDetected();
}
ret = false;
}
value = doc[key].as<int>();
int lvalue = value;
bool ret = jsonRead(json, key, lvalue, e);
value = lvalue;
return ret;
}
bool jsonRead(const String& json, String key, int& value, bool e) {
bool ret = true;
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
DeserializationError error = deserializeJson(doc, json);
if (error) {
if (e) {
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
}
ret = false;
SerialPrint("EE", F("jsonRead"), error.f_str());
jsonErrorDetected();
return false;
} else if (!doc.containsKey(key)) {
if (e) {
SerialPrint("EE", F("jsonRead"), key + " missing");
jsonErrorDetected();
}
ret = false;
return false;
}
value = doc[key].as<int>();
return ret;
return true;
}
// new==============================================================================