From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirerRowControl.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirerRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirerRowControl.cs
index 0b92e68..68e2b5b 100644
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirerRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirerRowControl.cs
@@ -48,6 +48,8 @@
btnOpen.ButtonClickEvent += (sender, e) =>
{
((Airer)i_device).AirerUpDownStopControl(0);
+ base.RefreshControlInfo(i_device);
+ return;
};
//鍋滄鎺т欢
@@ -76,6 +78,8 @@
btnClose.ButtonClickEvent += (sender, e) =>
{
((Airer)i_device).AirerUpDownStopControl(1);
+ base.RefreshControlInfo(i_device);
+ return;
};
//鍒锋柊鍥炬爣鎺т欢鐨勫浘鏍�
@@ -141,18 +145,18 @@
}
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
- //if (this.CheckCanSendStatuComand() == true)
- //{
- for (int i = 2; i < 6; i++)
+ if (this.CheckCanSendStatuComand() == true)
{
- //娉ㄦ剰锛岃。鏋朵腑鐨勭姸鎬佺敱涓嶅悓绔偣鑾峰彇
- //鍥炶矾2:璇诲彇鐓ф槑寮�鍏崇姸鎬�
- //鍥炶矾3:璇诲彇椋庡共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
- //鍥炶矾4:璇诲彇鐑樺共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
- //鍥炶矾5:璇诲彇娑堟瘨寮�鍏崇姸鎬佸拰鏃堕棿鍊�
- HdlDeviceAttributeLogic.Current.SendAirerComand(this.device, i);
+ for (int i = 2; i < 6; i++)
+ {
+ //娉ㄦ剰锛岃。鏋朵腑鐨勭姸鎬佺敱涓嶅悓绔偣鑾峰彇
+ //鍥炶矾2:璇诲彇鐓ф槑寮�鍏崇姸鎬�
+ //鍥炶矾3:璇诲彇椋庡共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+ //鍥炶矾4:璇诲彇鐑樺共寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+ //鍥炶矾5:璇诲彇娑堟瘨寮�鍏崇姸鎬佸拰鏃堕棿鍊�
+ HdlDeviceAttributeLogic.Current.SendAirerComand(this.device, i);
+ }
}
- //}
}
#endregion
--
Gitblit v1.8.0