JDierkse/PresenceDetection
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Makefile.conf and Libraries

Browse Source
This commit is contained in:
JDierkse
2020-05-04 22:01:48 +02:00
parent dd7ae1cb73
commit 2d9621f1f1
12 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UniFi/Device.cpp
+5 -5
View File
@@ -1,5 +1,5 @@
#include "Device.h"
#include "Util/JSON.h"
#include <json.hpp>
#include <Logging.h>
#include <algorithm>
#include <sstream>
@@ -59,7 +59,7 @@ bool Device::Login()
std::stringstream url;
url << "https://" << m_hostname << ":" << m_port << "/api/login";
Util::JSON json;
nlohmann::json json;
json["password"] = m_password;
json["username"] = m_username;
@@ -71,7 +71,7 @@ bool Device::Login()
std::stringstream output;
output << m_httpClient.GetUrlPostContents(url.str(), headers, m_cookieFile, json.dump());
Util::JSON outputJSON = Util::JSON::parse(output);
nlohmann::json outputJSON = nlohmann::json::parse(output);
if (outputJSON["meta"]["rc"] != "ok")
{
@@ -154,7 +154,7 @@ void Device::UpdateDevicesFromInventory()
try
{
std::string devices = m_httpClient.GetUrlContents(m_inventoryURL);
Util::JSON json = Util::JSON::parse(devices);
nlohmann::json json = nlohmann::json::parse(devices);
m_devices.clear();
for (auto& element : json)
@@ -198,7 +198,7 @@ void Device::UpdatePresentDevices()
std::stringstream output;
output << m_httpClient.GetUrlContents(url.str(), m_cookieFile);
Util::JSON json = Util::JSON::parse(output);
nlohmann::json json = nlohmann::json::parse(output);
if (json["meta"]["rc"] != "ok")
{