From fbbfd430f289f3c0cc0f826b2207944ef7205c9d Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期二, 10 十二月 2019 10:17:50 +0800 Subject: [PATCH] 2019.12.10 --- ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs index a2299cc..14601b1 100644 --- a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs +++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs @@ -3,6 +3,7 @@ using ZigBee.Device; using Shared.Phone.Device.CommonForm; using Shared.Phone.UserView; +using Shared.Phone.Device.DeviceLogic; namespace Shared.Phone.Device.AC { @@ -117,6 +118,10 @@ /// </summary> private LeftIconButtonRow cleanStatu; + /// <summary> + /// IsDrawerLockMode + /// </summary> + public bool IsDrawerLockMode; #endregion #region 鈼� 鎺ュ彛___________________________ @@ -354,6 +359,7 @@ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor; ZigBee.Device.ZbGateway.StatusList.Add(this); HomePage.Instance.ScrollEnabled = false; + } #endregion @@ -370,6 +376,10 @@ //action = null; RemoveUpdateControlDeviceStatuAction(); HomePage.Instance.ScrollEnabled = true; + if (IsDrawerLockMode) + { + CommonPage.Instance.IsDrawerLockMode = false; + } base.RemoveFromParent(); } @@ -401,16 +411,7 @@ //鍙戦�佽鍙栫姸鎬佸懡浠� UserView.UserHomeView.ReadStatus(ac, () => { - ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch); - ac.ReadLocalTemperature(); - ac.ReadCoolingSetpoint(); - ac.ReadHeatingSetpoint(); - ac.ReadAutoSetpoint(); - ac.ReadFanMode(); - ac.ReadSystemMode(); - ac.ReadSystemFansSwingMode(); - ac.ReadModeSupport(); - ac.ReadCleanStatu(); + ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice); }); } else @@ -418,16 +419,7 @@ //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵�� if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan) { - ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch); - ac.ReadLocalTemperature(); - ac.ReadCoolingSetpoint(); - ac.ReadHeatingSetpoint(); - ac.ReadAutoSetpoint(); - ac.ReadFanMode(); - ac.ReadSystemMode(); - ac.ReadSystemFansSwingMode(); - ac.ReadModeSupport(); - ac.ReadCleanStatu(); + ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice); } } @@ -576,7 +568,7 @@ Text = ACControlBase.GetModeNameByModeId(ac.currentSystemMode) }; itemView.AddChidren(currentModeBtn); - + reduceTemperatureBtn = new Button() { X = Application.GetRealWidth(268), -- Gitblit v1.8.0