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

meross: Add Qt6 support

master
Simon Stürz 2025-08-08 14:47:31 +02:00
parent 19921dc6db
commit f4a6c8bff9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meross/integrationpluginmeross.cpp
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2024, nymea GmbH * Copyright 2013 - 2025, nymea GmbH
* Contact: contact@nymea.io * Contact: contact@nymea.io
* *
* This file is part of nymea. * This file is part of nymea.
@ -32,16 +32,17 @@
#include "integrationpluginmeross.h" #include "integrationpluginmeross.h"
#include "plugininfo.h" #include "plugininfo.h"
#include <plugintimer.h>
#include <network/networkdevicediscovery.h> #include <network/networkdevicediscovery.h>
#include <network/networkaccessmanager.h> #include <network/networkaccessmanager.h>
#include <network/networkdevicediscoveryreply.h> #include <network/networkdevicediscoveryreply.h>
#include <plugintimer.h>
#include <QNetworkReply> #include <QNetworkReply>
#include <QAuthenticator> #include <QAuthenticator>
#include <QUrlQuery> #include <QUrlQuery>
#include <QJsonDocument> #include <QJsonDocument>
#include <QMetaEnum> #include <QMetaEnum>
#include <QRegularExpression>
IntegrationPluginMeross::IntegrationPluginMeross() IntegrationPluginMeross::IntegrationPluginMeross()
{ {
@ -122,7 +123,7 @@ void IntegrationPluginMeross::confirmPairing(ThingPairingInfo *info, const QStri
params.insert("password", secret); params.insert("password", secret);
QByteArray encodedParams = QJsonDocument::fromVariant(params).toJson(QJsonDocument::Compact).toBase64(); QByteArray encodedParams = QJsonDocument::fromVariant(params).toJson(QJsonDocument::Compact).toBase64();
QByteArray nonce = QUuid::createUuid().toString().remove(QRegExp("[{}-]")).left(16).toUtf8(); QByteArray nonce = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]")).left(16).toUtf8();
QByteArray initKey = "23x17ahWarFH6w29"; QByteArray initKey = "23x17ahWarFH6w29";
QByteArray timestamp = QByteArray::number(QDateTime::currentMSecsSinceEpoch() / 1000); QByteArray timestamp = QByteArray::number(QDateTime::currentMSecsSinceEpoch() / 1000);
QByteArray signature = initKey + timestamp + nonce + encodedParams; QByteArray signature = initKey + timestamp + nonce + encodedParams;
@ -373,7 +374,7 @@ QNetworkReply* IntegrationPluginMeross::request(Thing *thing, const QString &nam
{ {
QByteArray key = m_keys.value(thing); QByteArray key = m_keys.value(thing);
QString messageId = QUuid::createUuid().toString().remove(QRegExp("[{}-]")); QString messageId = QUuid::createUuid().toString().remove(QRegularExpression("[{}-]"));
qulonglong timestamp = QDateTime::currentMSecsSinceEpoch(); qulonglong timestamp = QDateTime::currentMSecsSinceEpoch();
quint16 timestampMs = timestamp % 1000; quint16 timestampMs = timestamp % 1000;
timestamp = timestamp / 1000; timestamp = timestamp / 1000;

5
meross/integrationpluginmeross.h
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2024, nymea GmbH * Copyright 2013 - 2025, nymea GmbH
* Contact: contact@nymea.io * Contact: contact@nymea.io
* *
* This file is part of nymea. * This file is part of nymea.
@ -31,7 +31,8 @@
#ifndef INTEGRATIONPLUGINMEROSS_H #ifndef INTEGRATIONPLUGINMEROSS_H
#define INTEGRATIONPLUGINMEROSS_H #define INTEGRATIONPLUGINMEROSS_H
#include "integrations/integrationplugin.h" #include <integrations/integrationplugin.h>
#include "extern-plugininfo.h" #include "extern-plugininfo.h"
class PluginTimer; class PluginTimer;