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/UserFan.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs
index 594ed1d..af2a9fe 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Fan/UserFan.cs
@@ -220,8 +220,8 @@
btnBottomSwitch = new Button () {
X = Application.GetRealWidth (212),
Y = speedView.Bottom + Application.GetRealHeight (250),
- Width = Application.GetRealWidth (215),
- Height = Application.GetRealHeight (95),
+ Width = Application.GetMinRealAverage (215),
+ Height = Application.GetMinRealAverage (95),
SelectedImagePath = "Fan/FanSwitchOn.png",
UnSelectedImagePath = "Fan/FanSwitch.png",
IsSelected = fanModule.Switch != 0
@@ -243,6 +243,8 @@
////Control.ControlBytesSend (Command.SetSingleLight, fanModule.SubnetID, fanModule.DeviceID,new byte [] { fanModule.LoopID, fanModule.WindSpeed });
//SendControlFan (fanModule, fanModule.WindSpeed);
//speedView.BackgroundImagePath = "Fan/Speed" + fanModule.WindSpeed.ToString () + ".png";
+ if (fanModule.WindSpeed == 0) fanModule.WindSpeed = 1;
+
SendControlFan (fanModule, fanModule.WindSpeed);
}
//IO.FileUtils.SaveEquipmentMessage (fanModule, fanModule.LoopID.ToString ());
@@ -262,6 +264,9 @@
////Control.ControlBytesSend (Command.SetSingleLight, fanModule.SubnetID, fanModule.DeviceID, new byte [] { fanModule.LoopID, fanModule.WindSpeed });
//SendControlFan (fanModule, fanModule.WindSpeed);
//speedView.BackgroundImagePath = "Fan/Speed" + fanModule.Switch.ToString () + ".png";
+
+ if (fanModule.WindSpeed == 0) fanModule.WindSpeed = 1;
+
SendControlFan (fanModule, fanModule.WindSpeed);
}
//IO.FileUtils.SaveEquipmentMessage (fanModule, fanModule.LoopID.ToString ());
--
Gitblit v1.8.0