ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added command queue

Browse Source
This commit is contained in:
bernhard.trinnes 2020-08-18 16:27:41 +02:00 committed by Simon Stürz
parent 015349d2e5
commit 8a5f32c479
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sma/sunnywebboxcommunication.cpp
View File

@ -34,6 +34,7 @@
#include "QJsonDocument" #include "QJsonDocument"
#include "QJsonObject" #include "QJsonObject"
#include <QUuid> #include <QUuid>
#include <QTimer>
SunnyWebBoxCommunication::SunnyWebBoxCommunication(QObject *parent) : QObject(parent) SunnyWebBoxCommunication::SunnyWebBoxCommunication(QObject *parent) : QObject(parent)
{ {
@ -72,13 +73,14 @@ QString SunnyWebBoxCommunication::sendMessage(const QHostAddress &address, const
doc.setObject(obj); doc.setObject(obj);
QByteArray data = doc.toJson(QJsonDocument::JsonFormat::Compact); QByteArray data = doc.toJson(QJsonDocument::JsonFormat::Compact);
qCDebug(dcSma()) << "Send message" << data << address << m_port; qCDebug(dcSma()) << "Send message" << data << address << m_port;
if(m_messageQueue.value(address).isEmpty()) { if(m_messageResponsePending) {
m_udpSocket->writeDatagram(data, address, m_port); m_udpSocket->writeDatagram(data, address, m_port);
m_messageResponsePending = true;
} else { } else {
if (m_messageQueue[address].length() < 40) { if (m_messageQueue[address].length() < 40) {
m_messageQueue[address].append(data); m_messageQueue[address].append(data);
} else { } else {
qCDebug(dcSma()) << "Message queue overflow"; qCWarning(dcSma()) << "Message queue overflow";
return ""; return "";
} }
} }
@ -100,8 +102,9 @@ QString SunnyWebBoxCommunication::sendMessage(const QHostAddress &address, const
doc.setObject(obj); doc.setObject(obj);
QByteArray data = doc.toJson(QJsonDocument::JsonFormat::Compact); QByteArray data = doc.toJson(QJsonDocument::JsonFormat::Compact);
qCDebug(dcSma()) << "Send message" << data << address << m_port; qCDebug(dcSma()) << "Send message" << data << address << m_port;
if(m_messageQueue.value(address).isEmpty()) { if(m_messageResponsePending) {
m_udpSocket->writeDatagram(data, address, m_port); m_udpSocket->writeDatagram(data, address, m_port);
m_messageResponsePending = true;
} else { } else {
if (m_messageQueue[address].length() < 40) { if (m_messageQueue[address].length() < 40) {
m_messageQueue[address].append(data); m_messageQueue[address].append(data);
@ -118,9 +121,11 @@ void SunnyWebBoxCommunication::datagramReceived(const QHostAddress &address, con
if(!m_messageQueue.value(address).isEmpty()) { if(!m_messageQueue.value(address).isEmpty()) {
QByteArray data = m_messageQueue[address].takeFirst(); QByteArray data = m_messageQueue[address].takeFirst();
qCDebug(dcSma()) << "Send message from queue" << data << address << m_port; qCDebug(dcSma()) << "Send message from queue" << data << address << m_port;
m_udpSocket->writeDatagram(data, address, m_port); //The interval between two queries should not be less than 30 seconds.
QTimer::singleShot(3000, this, [this, data, address]{m_udpSocket->writeDatagram(data, address, m_port);});
} else {
m_messageResponsePending = false;
} }
QList<QByteArray> arrayList = data.split('\x00'); QList<QByteArray> arrayList = data.split('\x00');
QByteArray cleanData; QByteArray cleanData;
Q_FOREACH(QByteArray i, arrayList) { Q_FOREACH(QByteArray i, arrayList) {

1
sma/sunnywebboxcommunication.h
View File

@ -45,6 +45,7 @@ public:
private: private:
int m_port = 34268; int m_port = 34268;
bool m_messageResponsePending = false;
QUdpSocket *m_udpSocket; QUdpSocket *m_udpSocket;
QHash<QHostAddress, QList<QByteArray>> m_messageQueue; QHash<QHostAddress, QList<QByteArray>> m_messageQueue;