新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -61,7 +61,7 @@
            this.ScrollEnabled = false;

            this.WcdType = ((Rollershade)this.device).WcdType;

            //设置状态文字

            this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

            this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));



            if (WcdType == 0)

            {

@@ -96,7 +96,7 @@
                        SeekBarOpenCurtain.Progress = 100;

                    }

                    //设置状态文字

                    this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

                    this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));

                    return;

                }

                //发送窗帘命令

@@ -145,7 +145,7 @@
                        SeekBarOpenCurtain.Progress = 0;

                    }

                    //设置状态文字

                    this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

                    this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));

                    return;

                }

                //发送窗帘命令

@@ -186,7 +186,6 @@
            SeekBarSiphonateCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;

            frameWhiteBack.AddChidren(SeekBarSiphonateCurtain);

            SeekBarSiphonateCurtain.IsProgressTextShow = false;

            SeekBarSiphonateCurtain.CurtainPaddingTop = Application.GetRealHeight(110);



            //卷帘控件里面的那个显示百分比的控件

            int progressY = SeekBarSiphonateCurtain.Y - Application.GetMinReal(204);

@@ -366,19 +365,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);

        }

@@ -400,7 +400,7 @@
                HdlThreadLogic.Current.RunMain(() =>

                {

                    //设置状态文字

                    this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));

                    this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));

                    if (this.isProgressing == false)

                    {

                        //当进度值在手动变更中时,不接收推送