2019.12.13

gxc

2019-12-13 eb424d24e39bab4a245725f35deab3f234ea0f13

 ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs

old mode 100755
new mode 100644
@@ -1,6 +1,7 @@
using System;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
using Shared.Phone.Device.DeviceLogic;
using ZigBee.Device;

namespace Shared.Phone.Device.Light
@@ -61,6 +62,11 @@
        /// MaxLevel
        /// </summary>
        private const int MaxLevel = 254;

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

        #region ◆ 接口__________________________
@@ -191,8 +197,12 @@
        {
            ZbGateway.StatusList.Remove(this);
            UserView.HomePage.Instance.ScrollEnabled = true;
            action();
            action = null;
            //action();
            //action = null;
            if (IsDrawerLockMode)
            {
                CommonPage.Instance.IsDrawerLockMode = false;
            }
            base.RemoveFromParent();
        }

@@ -204,6 +214,7 @@
        /// </summary>
        public DimmableLightControl()
        {
            UserView.HomePage.Instance.ScrollEnabled = false;
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            ZbGateway.StatusList.Add(this);
        }
@@ -236,9 +247,7 @@
                //发送读取状态命令
                UserView.UserHomeView.ReadStatus(dimmableLight, () =>
                {
                    dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
                    dimmableLight.ReadOnOffStatus();
                    dimmableLight.ReadLevel();
                    ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
                });
            }
            else
@@ -246,9 +255,7 @@
                //防止短时间内多次读取设备状态
                if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
                {
                    dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
                    dimmableLight.ReadOnOffStatus();
                    dimmableLight.ReadLevel();
                    ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
                }
            }
        }
@@ -269,16 +276,6 @@
            {
                RemoveFromParent();
            };

            var sharedBtn = new Button
            {
                X = Application.GetRealWidth(850),
                Width = Application.GetMinReal(69),
                Height = Application.GetMinReal(69),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Shared.png"
            };
            top.topView.AddChidren(sharedBtn);

            var moreBtn = new Button
            {
@@ -531,12 +528,12 @@
            //collection
            if ((sender as Button).IsSelected)
            {
                Shared.Common.Room.GetLoveRoom().DeleteDevice(device.FileName);
                Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
                (sender as Button).IsSelected = false;
            }
            else
            {
                Shared.Common.Room.GetLoveRoom().AddDevice(device.FileName);
                Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
                (sender as Button).IsSelected = true;
            }
        }