UNOV/mycorerepository
1
0
Fork 0
mirror of https://bitbucket.org/myhomie/mycorerepository.git synced 2025-12-06 01:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add local group update

Browse Source
This commit is contained in:
Thomas Fransolet 2021-01-19 17:39:05 +01:00
parent 5b6b3930c9
commit 1b2d7cb87b
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MyCore.Interfaces/Models/Providers/Zigbee/Aqara/AqaraSwitch.cs
View File

@ -7,7 +7,8 @@ namespace MyCore.Interfaces.Models
{
public class AqaraSwitch : AqaraDevice
{
public string Click { get; set; }
public string Click { get; set; } //single, double, triple, quadruple, long, long_release
public int Duration { get; set; }
}

1
MyCore.Interfaces/Models/Providers/Zigbee/Zigbee2MqttRequest.cs
View File

@ -7,6 +7,7 @@ namespace MyCore.Interfaces.Models
public class Zigbee2MqttRequest
{
public string state { get; set; }
public int brightness { get; set; } // 0 -> 255 GU10
// TODO
}

27
MyCore/Services/Devices/ActionService.cs
View File

@ -34,7 +34,7 @@ namespace MyCore.Services.Devices
if (topicSplit[1].Contains("MagicCube0"))
{
var test = JsonConvert.DeserializeObject<AqaraCube>(message);
if (test.Action == "shake")
/*if (test.Action == "shake")
{
if (YeelightService.devices.Count <= 0) {
await YeelightService.GetDevices();
@ -43,6 +43,15 @@ namespace MyCore.Services.Devices
if (labLamp != null) {
Task.Run(async () => { await YeelightService.Toggle(labLamp); });
}
}*/
if (test.Action == "shake")
{
// TODO Check state
Zigbee2MqttRequest zigbee2MqttRequest = new Zigbee2MqttRequest() { state = "OFF", brightness = 0 };
var request = JsonConvert.SerializeObject(zigbee2MqttRequest);
MqttClientService.PublishMessage("zigbee2mqtt/LampeTable/set", request);
}
if (test.Action == "tap")
{
@ -109,24 +118,20 @@ namespace MyCore.Services.Devices
}
if (topicSplit[1].Contains("Motion0"))
{
var aqaraSwitch = JsonConvert.DeserializeObject<AqaraMotion>(message);
if (aqaraSwitch.occupancy)
var aqaraMotion = JsonConvert.DeserializeObject<AqaraMotion>(message);
if (aqaraMotion.occupancy)
{
Zigbee2MqttRequest zigbee2MqttRequest = new Zigbee2MqttRequest() { state = "ON" };
Zigbee2MqttRequest zigbee2MqttRequest = new Zigbee2MqttRequest() { state = "ON", brightness = 255 };
var request = JsonConvert.SerializeObject(zigbee2MqttRequest);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau0/set", request);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau1/set", request);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau2/set", request);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau/set", request);
}
else
{
Zigbee2MqttRequest zigbee2MqttRequest = new Zigbee2MqttRequest() { state = "OFF" };
Zigbee2MqttRequest zigbee2MqttRequest = new Zigbee2MqttRequest() { state = "OFF", brightness = 0 };
var request = JsonConvert.SerializeObject(zigbee2MqttRequest);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau0/set", request);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau1/set", request);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau2/set", request);
MqttClientService.PublishMessage("zigbee2mqtt/GU10Bureau/set", request);
}
}
break;