2020-09-06 23:00:33 +03:00
|
|
|
#include "Utils/statUtils.h"
|
|
|
|
|
|
2020-09-07 00:36:03 +03:00
|
|
|
#include <Arduino.h>
|
2020-09-06 23:00:33 +03:00
|
|
|
|
2020-09-07 00:36:03 +03:00
|
|
|
#include "Global.h"
|
2020-09-06 23:00:33 +03:00
|
|
|
|
|
|
|
|
void initSt() {
|
2020-09-07 01:32:09 +03:00
|
|
|
addNewDevice(FIRMWARE_NAME);
|
|
|
|
|
getPsn();
|
2020-09-06 23:00:33 +03:00
|
|
|
if (TELEMETRY_UPDATE_INTERVAL_MIN) {
|
|
|
|
|
ts.add(
|
|
|
|
|
STATISTICS, TELEMETRY_UPDATE_INTERVAL_MIN * 60000, [&](void*) {
|
2020-09-07 00:36:03 +03:00
|
|
|
updateDeviceStatus(timeNow->getUptime(), FIRMWARE_VERSION);
|
2020-09-06 23:00:33 +03:00
|
|
|
},
|
|
|
|
|
nullptr, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-07 01:32:09 +03:00
|
|
|
void getPsn() {
|
|
|
|
|
if ((WiFi.status() == WL_CONNECTED)) {
|
|
|
|
|
String res = getURL("http://ipinfo.io/?token=c60f88583ad1a4");
|
|
|
|
|
String line = jsonReadStr(res, "loc");
|
|
|
|
|
String lat = selectToMarker(line, ",");
|
|
|
|
|
String lon = deleteBeforeDelimiter(line, ",");
|
|
|
|
|
String city = jsonReadStr(res, "city");
|
|
|
|
|
String country = jsonReadStr(res, "country");
|
|
|
|
|
String region = jsonReadStr(res, "region");
|
|
|
|
|
updateDevicePsn(lat, lon, "1000", timeNow->getUptime(), FIRMWARE_VERSION);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-06 23:00:33 +03:00
|
|
|
void addNewDevice(String model) {
|
|
|
|
|
if ((WiFi.status() == WL_CONNECTED)) {
|
|
|
|
|
WiFiClient client;
|
|
|
|
|
HTTPClient http;
|
|
|
|
|
String json = "{}";
|
|
|
|
|
String mac = WiFi.macAddress().c_str();
|
|
|
|
|
createNewDevJson(json, model);
|
|
|
|
|
//Serial.println(json);
|
|
|
|
|
http.begin(client, "http://95.128.182.133:8082/api/devices/");
|
|
|
|
|
http.setAuthorization("admin", "admin");
|
|
|
|
|
http.addHeader("Content-Type", "application/json");
|
|
|
|
|
int httpCode = http.POST(json);
|
|
|
|
|
if (httpCode > 0) {
|
|
|
|
|
Serial.printf("code: %d\n", httpCode);
|
|
|
|
|
if (httpCode == HTTP_CODE_OK) {
|
|
|
|
|
//String payload = http.getString();
|
|
|
|
|
//Serial.println("received payload:\n<<");
|
|
|
|
|
//Serial.println(payload);
|
|
|
|
|
//saveId("statid.txt", jsonReadInt(payload, "id"));
|
|
|
|
|
//Serial.println(">>");
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
Serial.printf("error: %s\n", http.errorToString(httpCode).c_str());
|
|
|
|
|
}
|
|
|
|
|
http.end();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-07 00:36:03 +03:00
|
|
|
void updateDevicePsn(String lat, String lon, String accur, String uptime, String firm) {
|
2020-09-06 23:00:33 +03:00
|
|
|
if ((WiFi.status() == WL_CONNECTED)) {
|
|
|
|
|
WiFiClient client;
|
|
|
|
|
HTTPClient http;
|
|
|
|
|
http.begin(client, "http://95.128.182.133:5055/");
|
|
|
|
|
http.setAuthorization("admin", "admin");
|
|
|
|
|
http.addHeader("Content-Type", "application/json");
|
|
|
|
|
String mac = WiFi.macAddress().c_str();
|
2020-09-07 01:32:09 +03:00
|
|
|
int httpCode = http.POST("?id=" + mac + "&resetReason=" + ESP.getResetReason() + "&lat=" + lat + "&lon=" + lon + "&accuracy=" + accur + "");
|
2020-09-06 23:00:33 +03:00
|
|
|
|
|
|
|
|
if (httpCode > 0) {
|
|
|
|
|
Serial.printf("code: %d\n", httpCode);
|
2020-09-07 00:36:03 +03:00
|
|
|
if (httpCode == HTTP_CODE_OK) {
|
|
|
|
|
//const String& payload = http.getString();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
Serial.printf("error: %s\n", http.errorToString(httpCode).c_str());
|
|
|
|
|
}
|
|
|
|
|
http.end();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void updateDeviceStatus(String uptime, String firm) {
|
|
|
|
|
if ((WiFi.status() == WL_CONNECTED)) {
|
|
|
|
|
WiFiClient client;
|
|
|
|
|
HTTPClient http;
|
|
|
|
|
http.begin(client, "http://95.128.182.133:5055/");
|
|
|
|
|
http.setAuthorization("admin", "admin");
|
|
|
|
|
http.addHeader("Content-Type", "application/json");
|
|
|
|
|
String mac = WiFi.macAddress().c_str();
|
|
|
|
|
int httpCode = http.POST("?id=" + mac + "&resetReason=" + ESP.getResetReason() + "&uptime=" + uptime + "&version=" + firm + "");
|
|
|
|
|
|
|
|
|
|
if (httpCode > 0) {
|
|
|
|
|
Serial.printf("code: %d\n", httpCode);
|
2020-09-06 23:00:33 +03:00
|
|
|
if (httpCode == HTTP_CODE_OK) {
|
|
|
|
|
//const String& payload = http.getString();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
Serial.printf("error: %s\n", http.errorToString(httpCode).c_str());
|
|
|
|
|
}
|
|
|
|
|
http.end();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void createNewDevJson(String& json, String model) {
|
|
|
|
|
String mac = WiFi.macAddress().c_str();
|
|
|
|
|
jsonWriteStr(json, "name", mac);
|
|
|
|
|
jsonWriteStr(json, "uniqueId", mac);
|
|
|
|
|
jsonWriteStr(json, "model", model);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//void updateDeviceList(String model, String firmVer) {
|
|
|
|
|
// if ((WiFi.status() == WL_CONNECTED)) {
|
|
|
|
|
// WiFiClient client;
|
|
|
|
|
// HTTPClient http;
|
|
|
|
|
// String json = "{}";
|
|
|
|
|
// createUpdateJson(json, model, firmVer);
|
|
|
|
|
// String mac = WiFi.macAddress().c_str();
|
|
|
|
|
// http.begin(client, "http://95.128.182.133:8082/api/devices/" + mac + "/");
|
|
|
|
|
// http.setAuthorization("admin", "admin");
|
|
|
|
|
// http.addHeader("Content-Type", "application/json");
|
|
|
|
|
// int httpCode = http.PUT(json);
|
|
|
|
|
// if (httpCode > 0) {
|
|
|
|
|
// Serial.printf("update Device List... code: %d\n", httpCode);
|
|
|
|
|
// if (httpCode == HTTP_CODE_OK) {
|
|
|
|
|
// const String& payload = http.getString();
|
|
|
|
|
// Serial.println("received payload:\n<<");
|
|
|
|
|
// Serial.println(payload);
|
|
|
|
|
// Serial.println(">>");
|
|
|
|
|
// }
|
|
|
|
|
// } else {
|
|
|
|
|
// Serial.printf("[HTTP] POST... failed, error: %s\n", http.errorToString(httpCode).c_str());
|
|
|
|
|
// }
|
|
|
|
|
// http.end();
|
|
|
|
|
// }
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
//void createUpdateJson(String& json, String model, String ver) {
|
|
|
|
|
// String mac = WiFi.macAddress().c_str();
|
|
|
|
|
// jsonWriteInt(json, "id", getId("statid.txt"));
|
|
|
|
|
// jsonWriteStr(json, "name", mac);
|
|
|
|
|
// jsonWriteStr(json, "uniqueId", mac);
|
|
|
|
|
// jsonWriteStr(json, "model", model);
|
|
|
|
|
// jsonWriteStr(json, "phone", ver);
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
//void saveId(String file, int id) {
|
|
|
|
|
// removeFile(file);
|
|
|
|
|
// addFile(file, String(id));
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
//int getId(String file) {
|
|
|
|
|
// return readFile(file, 100).toInt();
|
|
|
|
|
//}
|