tuya: Add Qt6 support

master
Simon Stürz 2025-08-11 14:48:11 +02:00
parent d2593bb465
commit e5413a8950
3 changed files with 11 additions and 13 deletions

View File

@ -36,10 +36,10 @@
#include <QJsonDocument> #include <QJsonDocument>
#include <QColor> #include <QColor>
#include "hardwaremanager.h" #include <hardwaremanager.h>
#include "network/networkaccessmanager.h" #include <network/networkaccessmanager.h>
#include "plugintimer.h" #include <plugintimer.h>
// API info: // API info:
// Python project: https://github.com/PaulAnnekov/tuyaha // Python project: https://github.com/PaulAnnekov/tuyaha
@ -547,7 +547,7 @@ void IntegrationPluginTuya::queryDevice(Thing *thing)
QNetworkReply *reply = hardwareManager()->networkManager()->post(request, jsonDoc.toJson(QJsonDocument::Compact)); QNetworkReply *reply = hardwareManager()->networkManager()->post(request, jsonDoc.toJson(QJsonDocument::Compact));
connect(reply, &QNetworkReply::finished, [reply](){reply->deleteLater();}); connect(reply, &QNetworkReply::finished, [reply](){reply->deleteLater();});
connect(reply, &QNetworkReply::finished, thing, [this, thing, reply](){ connect(reply, &QNetworkReply::finished, thing, [thing, reply](){
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
qCWarning(dcTuya()) << "Error fetching devices from Tuya cloud" << reply->error(); qCWarning(dcTuya()) << "Error fetching devices from Tuya cloud" << reply->error();
return; return;

View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2020, 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.
@ -33,7 +33,7 @@
#include <QTimer> #include <QTimer>
#include "integrations/integrationplugin.h" #include <integrations/integrationplugin.h>
class PluginTimer; class PluginTimer;
@ -66,11 +66,11 @@ private:
void controlTuyaSwitch(const QString &devId, const QString &command, const QVariant &value, ThingActionInfo *info); void controlTuyaSwitch(const QString &devId, const QString &command, const QVariant &value, ThingActionInfo *info);
QHash<ThingId, QTimer*> m_tokenExpiryTimers; QHash<ThingId, QTimer *> m_tokenExpiryTimers;
PluginTimer *m_pluginTimerQuery = nullptr; PluginTimer *m_pluginTimerQuery = nullptr;
PluginTimer *m_pluginTimerDiscovery = nullptr; PluginTimer *m_pluginTimerDiscovery = nullptr;
QHash<Thing*, QList<Thing*>> m_pollQueue; QHash<Thing *, QList<Thing *>> m_pollQueue;
}; };
#endif // INTEGRATIONPLUGINTUYA_H #endif // INTEGRATIONPLUGINTUYA_H

View File

@ -1,13 +1,11 @@
include(../plugins.pri) include(../plugins.pri)
QT += network QT *= network
PKGCONFIG += nymea-mqtt PKGCONFIG += nymea-mqtt
TARGET = $$qtLibraryTarget(nymea_integrationplugintuya)
SOURCES += \ SOURCES += \
integrationplugintuya.cpp \ integrationplugintuya.cpp
HEADERS += \ HEADERS += \
integrationplugintuya.h \ integrationplugintuya.h