2020-09-02-3

陈嘉乐

2020-09-02 e79b65b97a8ae1eae5ee172dea1b52d041006599

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs

@@ -180,8 +180,8 @@
            //卷帘控件

            this.SeekBarSiphonateCurtain = new CurtainRollSeekBar();

            SeekBarSiphonateCurtain.Y = Application.GetRealHeight(300);

            SeekBarSiphonateCurtain.Width = Application.GetMinRealAverage(438);

            SeekBarSiphonateCurtain.Height = Application.GetMinRealAverage(576);

            SeekBarSiphonateCurtain.Width = this.GetPictrueRealSize(438);

            SeekBarSiphonateCurtain.Height = this.GetPictrueRealSize(576);

            SeekBarSiphonateCurtain.Gravity = Gravity.CenterHorizontal;

            SeekBarSiphonateCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;

            frameWhiteBack.AddChidren(SeekBarSiphonateCurtain);

@@ -279,8 +279,8 @@
            //开合帘控件

            this.SeekBarOpenCurtain = new CurtainSeekBar();

            SeekBarOpenCurtain.Y = Application.GetRealHeight(334);

            SeekBarOpenCurtain.Width = Application.GetMinRealAverage(570);

            SeekBarOpenCurtain.Height = Application.GetMinRealAverage(513);

            SeekBarOpenCurtain.Width = this.GetPictrueRealSize(570);

            SeekBarOpenCurtain.Height = this.GetPictrueRealSize(513);

            SeekBarOpenCurtain.Gravity = Gravity.CenterHorizontal;

            SeekBarOpenCurtain.IsProgressTextShow = false;

            SeekBarOpenCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;

@@ -366,19 +366,20 @@
        /// <param name="comand"></param>

        private void SetCurtainCommand(int comand)

        {

            //2020.07.20变更:放开限制,不再等待网关回复,也能点击按钮

            //在没有接收到反馈之前,不能再点击

            this.btnClose.CanClick = false;

            this.btnOpen.CanClick = false;

            this.btnStop.CanClick = false;

            //this.btnClose.CanClick = false;

            //this.btnOpen.CanClick = false;

            //this.btnStop.CanClick = false;



            //检测是否获取网关反馈的结果,如果网关没有回复,则会弹出消息

            this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>

            {

                //时间结束,可以再次点击

                this.btnClose.CanClick = true;

                this.btnOpen.CanClick = true;

                this.btnStop.CanClick = true;

            });

            //this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>

            //{

            //    //时间结束,可以再次点击

            //    this.btnClose.CanClick = true;

            //    this.btnOpen.CanClick = true;

            //    this.btnStop.CanClick = true;

            //});

            //发送命令

            ((Rollershade)device).CurtainUpDownStopControl(comand);

        }

@@ -395,11 +396,7 @@
        /// <returns></returns>

        public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)

        {

            if (comandDiv == ReceiveComandDiv.A节点控制反馈)

            {

                return true;

            }

            else if (comandDiv == ReceiveComandDiv.A设备属性上报)

            if (comandDiv == ReceiveComandDiv.A设备属性上报)

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

@@ -418,6 +415,7 @@
                        }

                    }

                });

                return true;

            }

            return false;

        }