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

Tuya: Fix devId parameter for blinds

master
Michael Zanetti 2020-05-16 14:12:13 +02:00
parent 657bc7d187
commit 20ca551b75
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tuya/integrationplugintuya.cpp
View File

@ -208,23 +208,28 @@ void IntegrationPluginTuya::executeAction(ThingActionInfo *info)
{ {
if (info->action().actionTypeId() == tuyaSwitchPowerActionTypeId) { if (info->action().actionTypeId() == tuyaSwitchPowerActionTypeId) {
bool on = info->action().param(tuyaSwitchPowerActionPowerParamTypeId).value().toBool(); bool on = info->action().param(tuyaSwitchPowerActionPowerParamTypeId).value().toBool();
controlTuyaSwitch("turnOnOff", on ? "1" : "0", info); QString devId = info->thing()->paramValue(tuyaSwitchThingIdParamTypeId).toString();
controlTuyaSwitch(devId, "turnOnOff", on ? "1" : "0", info);
connect(info, &ThingActionInfo::finished, [info, on](){ connect(info, &ThingActionInfo::finished, [info, on](){
info->thing()->setStateValue(tuyaSwitchPowerStateTypeId, on); info->thing()->setStateValue(tuyaSwitchPowerStateTypeId, on);
}); });
return; return;
} }
if (info->action().actionTypeId() == tuyaClosableOpenActionTypeId) { if (info->thing()->thingClassId() == tuyaClosableThingClassId) {
controlTuyaSwitch("turnOnOff", "1", info); QString devId = info->thing()->paramValue(tuyaClosableThingIdParamTypeId).toString();
return; if (info->action().actionTypeId() == tuyaClosableOpenActionTypeId) {
} controlTuyaSwitch(devId, "turnOnOff", "1", info);
if (info->action().actionTypeId() == tuyaClosableCloseActionTypeId) { return;
controlTuyaSwitch("turnOnOff", "0", info); }
return; if (info->action().actionTypeId() == tuyaClosableCloseActionTypeId) {
} controlTuyaSwitch(devId, "turnOnOff", "0", info);
if (info->action().actionTypeId() == tuyaClosableStopActionTypeId) { return;
controlTuyaSwitch("startStop", "0", info); }
return; if (info->action().actionTypeId() == tuyaClosableStopActionTypeId) {
controlTuyaSwitch(devId, "startStop", "0", info);
return;
}
} }
Q_ASSERT_X(false, "tuyaplugin", "Unhandled action type " + info->action().actionTypeId().toByteArray()); Q_ASSERT_X(false, "tuyaplugin", "Unhandled action type " + info->action().actionTypeId().toByteArray());
} }
@ -400,12 +405,12 @@ void IntegrationPluginTuya::updateChildDevices(Thing *thing)
} }
void IntegrationPluginTuya::controlTuyaSwitch(const QString &command, const QString &value, ThingActionInfo *info) void IntegrationPluginTuya::controlTuyaSwitch(const QString &devId, const QString &command, const QString &value, ThingActionInfo *info)
{ {
Thing *thing = info->thing(); Thing *thing = info->thing();
Thing *parentDevice = myThings().findById(thing->parentId()); Thing *parentDevice = myThings().findById(thing->parentId());
qCDebug(dcTuya()) << thing->name() << "Controlling Tuya switch. Parent:" << parentDevice->name() << "command:" << command << "value:" << value; qCDebug(dcTuya()) << "Controlling Tuya device" << info->thing() << ". Parent:" << parentDevice->name() << "command:" << command << "value:" << value;
pluginStorage()->beginGroup(parentDevice->id().toString()); pluginStorage()->beginGroup(parentDevice->id().toString());
QString accesToken = pluginStorage()->value("accessToken").toString(); QString accesToken = pluginStorage()->value("accessToken").toString();
@ -423,7 +428,7 @@ void IntegrationPluginTuya::controlTuyaSwitch(const QString &command, const QStr
QVariantMap payload; QVariantMap payload;
payload.insert("accessToken", accesToken); payload.insert("accessToken", accesToken);
payload.insert("devId", thing->paramValue(tuyaSwitchThingIdParamTypeId).toString()); payload.insert("devId", devId);
payload.insert("value", value); payload.insert("value", value);
QVariantMap data; QVariantMap data;

2
tuya/integrationplugintuya.h
View File

@ -63,7 +63,7 @@ private:
void refreshAccessToken(Thing *thing); void refreshAccessToken(Thing *thing);
void updateChildDevices(Thing *thing); void updateChildDevices(Thing *thing);
void controlTuyaSwitch(const QString &command, const QString &value, ThingActionInfo *info); void controlTuyaSwitch(const QString &devId, const QString &command, const QString &value, ThingActionInfo *info);
QHash<ThingId, QTimer*> m_tokenExpiryTimers; QHash<ThingId, QTimer*> m_tokenExpiryTimers;
PluginTimer *m_pluginTimer = nullptr; PluginTimer *m_pluginTimer = nullptr;