From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceTemperatureCardControl.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceTemperatureCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceTemperatureCardControl.cs
index 60c97e1..b9b5160 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceTemperatureCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceTemperatureCardControl.cs
@@ -15,11 +15,13 @@
/// <summary>
/// 鍙戦�佽幏鍙栫姸鎬佸懡浠�
/// </summary>
- /// <param name="i_device"></param>
- public override void SendStatuComand(CommonDevice i_device)
+ public override void SendStatuComand()
{
- (i_device as TemperatureSensor).ReadTemperatureOrHumidity();
- Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(i_device);
+ //妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
+ if (this.CheckCanSendStatuComand() == true)
+ {
+ (this.device as TemperatureSensor).ReadTemperatureOrHumidity();
+ }
}
#endregion
--
Gitblit v1.8.0