一个新的版本

黄学彪

2019-12-05 b3e96fce4cc01113128ddf8e0a18fc19594a9e56

 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;

@@ -137,8 +138,6 @@
                                {
                                    curtainSeekBar.Progress = rollerShade.WcdCurrentPositionLiftPercentage;
                                }
                                //SeekBar.Progress = rollerShade.WcdCurrentPositionLiftPercentage;
                                //seekBarTitle.Text = $"{SeekBar.Progress} %";
                                rollerShade.LastDateTime = DateTime.Now;
                            }
                            else if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
@@ -274,8 +273,7 @@
            {
                UserHomeView.ReadStatus(rollerShade, () =>
                {
                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
                    rollerShade.ReadWcdCurrentPositionLiftPercentage();
                    ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
                });
            }
            else
@@ -283,8 +281,7 @@
                //防止短时间内多次读取
                if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
                {
                    rollerShade.ReadWcdCurrentPositionLiftPercentage();
                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
                    ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
                }
            }

@@ -505,28 +502,12 @@
            //upBtn.MouseUpEventHandler += Up;
            //stopBtn.MouseUpEventHandler += Stop;
            //downBtn.MouseUpEventHandler += Down;
            //SeekBar.ProgressChanged += SeekBar_ProgressChange;
            //collectionBtn.MouseUpEventHandler += Collection;
            //moreBtn.MouseUpEventHandler += More;
            //roomBtn.MouseUpEventHandler += BackToRoomHandler;
            //roomName.MouseUpEventHandler += BackToRoomHandler;
            collectionBtn.MouseUpEventHandler += Collection;
        }

        #endregion

        #region ◆ 控制___________________________

        /// <summary>
        /// 滑条移动发送命令
        /// </summary>
        /// <param name="sender">Sender.</param>
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void SeekBar_ProgressChange(object sender, int mouseEventArgs)
        {
            //seekBarTitle.Text = $"{SeekBar.Progress}%";
            //(device.CommonDevice as ZigBee.Device.Rollershade).WcdGoToTiltValue(SeekBar.Progress);
        }

        #region ◆ 控制__________________________

        /// <summary>
        /// 上、开
@@ -726,11 +707,12 @@
                curtainSeekBar.Width = Application.GetRealWidth(570);
                curtainSeekBar.Height = Application.GetRealHeight(513);
                curtainSeekBar.Gravity = Gravity.CenterHorizontal;
                curtainSeekBar.Progress = (device.CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage;
                layout.AddChidren(curtainSeekBar);

                curtainSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
                {
                    (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
                    (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainSeekBar.Progress);
                };
            }
        }
@@ -748,15 +730,14 @@
        /// <param name="e">E.</param>
        private void Collection(object sender, MouseEventArgs e)
        {
            //collection
            if (collectionBtn.IsSelected)
            {
                Shared.Common.Room.Lists[0].DeleteDevice(device.FileName);
                Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
                collectionBtn.IsSelected = false;
            }
            else
            {
                Shared.Common.Room.Lists[0].AddDevice(device.FileName);
                Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
                collectionBtn.IsSelected = true;
            }
        }