From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期四, 03 九月 2020 09:46:29 +0800 Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时,去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持,Alexa 的场景同样增加通用开关的支持。 --- Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserDeviceToFan.cs | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserDeviceToFan.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserDeviceToFan.cs index 51310f8..fe07496 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserDeviceToFan.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserDeviceToFan.cs @@ -156,7 +156,11 @@ //} else { // fanModule.Switch = 0; //} + + if (fanModule.WindSpeed == 0) fanModule.WindSpeed = 1; + int mSetSwitch = tempSiwtch.IsSelected ? 0 : fanModule.WindSpeed; + System.Threading.Tasks.Task.Run (() => { byte [] returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, fanModule.SubnetID, fanModule.DeviceID, new byte [] { fanModule.LoopID, (byte)mSetSwitch }); Application.RunOnMainThread (() => { @@ -289,6 +293,9 @@ byte [] returnBytes = null; if (fanD.Type == DeviceType.FanModule) { if (open) { + + if ((fanD as FanModule).WindSpeed == 0) (fanD as FanModule).WindSpeed = 1; + returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, fanD.SubnetID, fanD.DeviceID, new byte [] { fanD.LoopID, (fanD as FanModule).WindSpeed }); } else { returnBytes = Control.ControlBytesSendHasReturn (Command.SetSingleLight, fanD.SubnetID, fanD.DeviceID, new byte [] { fanD.LoopID, 0 }); -- Gitblit v1.8.0