From 375751523a86b9ba0b3a27f04c3d3c4f19538690 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 03 三月 2021 09:35:00 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
index bc97f19..7431e71 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs
@@ -1211,7 +1211,18 @@
//}
//Control.ControlBytesSend (Command.SetSingleLight, fanModule.SubnetID, fanModule.DeviceID, new byte [] { fanModule.LoopID, fanModule.Switch });
- int mSetSwitch = tempSwitch.IsSelected ? 0 : fanModule.WindSpeed;
+ int mSetSwitch = 0;
+ if (!tempSwitch.IsSelected) {
+ //2021-03-02 淇寮�0妗ｉ棶棰�
+ if (fanModule.WindSpeed == 0) {
+ mSetSwitch = 1;
+ } else {
+ mSetSwitch = fanModule.WindSpeed;
+ }
+ } else {
+ mSetSwitch = 0;
+ }
+
SendControl.SendControlSetSingleLight (fanModule, new byte [] { fanModule.LoopID, (byte)mSetSwitch });
//IO.FileUtils.SaveEquipmentMessage (fanModule, fanModule.LoopID.ToString ());
};
--
Gitblit v1.8.0