2019.12.3

gxc

2019-12-03 d12e7730bb88d57763a6caaeacb0248a65bf3309

 ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs

@@ -1,6 +1,7 @@
using System;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserView;
using ZigBee.Device;

@@ -73,6 +74,11 @@
        /// 卷帘
        /// </summary>
        private CurtainRollSeekBar curtainRollSeekBar = new CurtainRollSeekBar { };

        /// <summary>
        /// IsDrawerLockMode
        /// </summary>
        public bool IsDrawerLockMode;

        #endregion

@@ -232,6 +238,10 @@
            //action();
            //action = null;
            RemoveUpdateControlDeviceStatuAction();
            if (IsDrawerLockMode)
            {
                CommonPage.Instance.IsDrawerLockMode = false;
            }
            base.RemoveFromParent();
        }

@@ -265,8 +275,7 @@
            {
                UserHomeView.ReadStatus(rollerShade, () =>
                {
                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
                    rollerShade.ReadWcdCurrentPositionLiftPercentage();
                    ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
                });
            }
            else
@@ -274,8 +283,7 @@
                //防止短时间内多次读取
                if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
                {
                    rollerShade.ReadWcdCurrentPositionLiftPercentage();
                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
                    ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
                }
            }