2019.12.25

gxc

2019-12-25 944b87b6bcccb095cd73f13f4410fb20faf48f74

 ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs

@@ -143,7 +143,7 @@
                listText.Add(Language.StringByID(R.MyInternationalizationString.uForwardDirection));//正向

                listText.Add(Language.StringByID(R.MyInternationalizationString.uReverseDirection));//反向



                var form = new BottomDialogSelectForm();

                var form = new BottomItemSelectForm();

                form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, nowSelectNo);

                form.FinishSelectEvent += async (index) =>

                {

@@ -299,7 +299,7 @@
                        startWait = false;

                        checking = true;



                        var value = openSeekBar.Progress;

                        var value = curtainData.OpenLimitPersent;

                        if (oldValue == value)

                        {

                            //相同数值

@@ -426,7 +426,7 @@
                        startWait = false;

                        checking = true;



                        var value = closeSeekBar.Progress;

                        var value = curtainData.CloseLimitPersent;

                        if (oldValue == value)

                        {

                            //相同数值

@@ -512,7 +512,7 @@


            bool receiptData = false;

            string mainkeys = LocalDevice.Current.GetDeviceMainKeys(curtainDevice);

            HdlDeviceAttributeLogic.Current.AddAttributeEvent("CurtainDeviceAttribute", "DeviceStatusReport", (device) =>

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("CurtainDeviceAttribute", ReceiveComandDiv.A设备属性上报, (device) =>

            {

                string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);

                if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)

@@ -576,7 +576,7 @@
                return false;

            }

            //移除监听

            HdlDeviceAttributeLogic.Current.RemoveEvent("CurtainDeviceAttribute");

            HdlGatewayReceiveLogic.Current.RemoveEvent("CurtainDeviceAttribute");



            //备份窗帘数据

            if (this.backupCurtainData == true)

@@ -605,12 +605,12 @@
        /// </summary>

        private void ReceiveLimitData()

        {

            if (HdlDeviceAttributeLogic.Current.IsEsixt("ReceiveLimitData") == true)

            if (HdlGatewayReceiveLogic.Current.IsEsixt("ReceiveLimitData") == true)

            {

                HdlDeviceAttributeLogic.Current.RemoveEvent("ReceiveLimitData");

                HdlGatewayReceiveLogic.Current.RemoveEvent("ReceiveLimitData");

            }

            string mainkeys = LocalDevice.Current.GetDeviceMainKeys(curtainDevice);

            HdlDeviceAttributeLogic.Current.AddAttributeEvent("ReceiveLimitData", "DeviceStatusReport", (device) =>

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("ReceiveLimitData", ReceiveComandDiv.A设备属性上报, (device) =>

            {

                string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);

                if (mainkeys != checkKey || device.DeviceStatusReport.CluterID != 258)

@@ -639,8 +639,12 @@
                                this.ShowMassage(ShowMsgType.Confirm, msg, async () =>

                                {

                                    //执行确认及覆盖上限位点

                                    await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.UpLimit,

                                    var result = await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.UpLimit,

                                        curtainData.OpenLimitPersent, curtainData.CloseLimitPersent);

                                    if (result == true)

                                    {

                                        curtainData.DeleteOpenLimit = true;

                                    }

                                });

                            }

                            //合限位

@@ -654,8 +658,12 @@
                                this.ShowMassage(ShowMsgType.Confirm, msg, async () =>

                                {

                                    //执行确认及覆盖合限位点

                                    await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.DownLimit,

                                    var result = await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.DownLimit,

                                        curtainData.OpenLimitPersent, curtainData.CloseLimitPersent);

                                    if (result == true)

                                    {

                                        curtainData.DeleteCloseLimit = true;

                                    }

                                });

                            }

                        }

@@ -671,14 +679,14 @@
        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseForm()

        public override void CloseFormBefore()

        {

            HdlDeviceAttributeLogic.Current.RemoveEvent("CurtainDeviceAttribute");

            HdlDeviceAttributeLogic.Current.RemoveEvent("ReceiveLimitData");

            HdlGatewayReceiveLogic.Current.RemoveEvent("CurtainDeviceAttribute");

            HdlGatewayReceiveLogic.Current.RemoveEvent("ReceiveLimitData");



            UserView.HomePage.Instance.ScrollEnabled = true;



            base.CloseForm();

            base.CloseFormBefore();

        }



        #endregion