异常捕获

wei

2021-04-01 ccdff82fac4bcc1067ec806ade5ae897f1214f4d

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs

@@ -73,9 +73,9 @@
        /// </summary>

        private MostRightIconControl btnAnionSwitch = null;

        /// <summary>

        /// 滤芯复位开关控件

        /// 滤芯复位开关控件 2021.03.09控件变更

        /// </summary>

        private MostRightIconControl btnResetSwitch = null;

        //private MostRightIconControl btnResetSwitch = null;

        /// <summary>

        /// 空气质量数据

        /// </summary>

@@ -328,12 +328,11 @@
            rowReset.Height = Application.GetRealHeight(50);

            rowReset.Width = FrameWhiteCentet2.Width;

            rowReset.Y = rowAnion.Bottom;

            FrameWhiteCentet2.AddChidren(rowReset);

            //FrameWhiteCentet2.AddChidren(rowReset);

            rowReset.AddLeftCaption(Language.StringByID(StringId.FilterElementReset), 200);

            rowReset.AddBottomLine();

            this.btnResetSwitch = rowReset.AddMostRightSwitchIcon();

            btnResetSwitch.IsSelected = this.airCleanerData.FilterReset;

            btnResetSwitch.ButtonClickEvent += (sender, e) =>

            rowReset.AddRightArrow();

            rowReset.ButtonClickEvent += (sender, e) =>

            {

                if (this.btnSwitch.IsSelected == false)

                {

@@ -345,7 +344,7 @@
                this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                {

                    //发送使能命令

                    this.SendEnableComand(btnResetSwitch, "filter_reset", btnResetSwitch.IsSelected == true ? "false" : "true");

                    this.SendEnableComand(null, "filter_reset", "true");

                });

            };

        }

@@ -624,12 +623,18 @@
        /// </summary>

        private void SendEnableComand(MostRightIconControl btnSwitch, string sendKey, string value)

        {

            btnSwitch.CanClick = false;

            if (btnSwitch != null)

            {

                btnSwitch.CanClick = false;

            }

            HdlThreadLogic.Current.RunThread(() =>

            {

                var dic = new Dictionary<string, string>();

                dic.Add(sendKey, value);

                Control.Ins.SendWriteCommand(this.device, dic, true);



                if (btnSwitch == null) { return; }



                HdlThreadLogic.Current.RunMain(() =>

                {

                    btnSwitch.CanClick = true;

@@ -769,10 +774,10 @@
                this.btnAnionSwitch.IsSelected = this.airCleanerData.Anion;

            }

            //滤芯复位

            if (this.btnResetSwitch.IsSelected != this.airCleanerData.FilterReset)

            {

                this.btnResetSwitch.IsSelected = this.airCleanerData.FilterReset;

            }

            //if (this.btnResetSwitch.IsSelected != this.airCleanerData.FilterReset)

            //{

            //    this.btnResetSwitch.IsSelected = this.airCleanerData.FilterReset;

            //}

        }



        #endregion

@@ -784,25 +789,25 @@
        /// </summary>

        private void RefreshNowDeviceStatuMemory(Function i_LocalDevice)

        {

            for (int i = 0; i < i_LocalDevice.status.Count; i++)

            for (int i = 0; i < i_LocalDevice.attributes.Count; i++)

            {

                var data = i_LocalDevice.status[i];

                var data = i_LocalDevice.attributes[i];

                //模式

                if (data.key == "mode") { this.airCleanerData.Mode = data.value; }

                if (data.key == "mode") { this.airCleanerData.Mode = data.state; }

                //风速档位

                else if (data.key == "speed") { this.airCleanerData.Gear = data.value; }

                else if (data.key == "speed") { this.airCleanerData.Gear = data.state; }

                //开关

                else if (data.key == "on_off") { this.airCleanerData.Open = data.value.ToLower() == "on"; }

                else if (data.key == "on_off") { this.airCleanerData.Open = data.state.ToLower() == "on"; }

                //童锁

                else if (data.key == "lock") { this.airCleanerData.Lock = data.value.ToLower() == "true"; }

                else if (data.key == "lock") { this.airCleanerData.Lock = data.state.ToLower() == "true"; }

                //滤芯复位

                else if (data.key == "filter_reset") { this.airCleanerData.FilterReset = data.value.ToLower() == "true"; }

                else if (data.key == "filter_reset") { this.airCleanerData.FilterReset = data.state.ToLower() == "true"; }

                //负离子

                else if (data.key == "anion") { this.airCleanerData.Anion = data.value.ToLower() == "true"; }

                else if (data.key == "anion") { this.airCleanerData.Anion = data.state.ToLower() == "true"; }

                //定时

                else if (data.key == "countdown")

                {

                    this.airCleanerData.Timing = data.value;

                    this.airCleanerData.Timing = data.state;

                    if (this.airCleanerData.Timing == "cancel")

                    {

                        this.airCleanerData.Timing = "0";

@@ -811,7 +816,7 @@
                //空气质量

                else if (data.key == "pm25")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.airCleanerData.PM25Value = Convert.ToInt32(value);

@@ -820,7 +825,7 @@
                //滤芯使用率

                else if (data.key == "filter")

                {

                    var value = data.value;

                    var value = data.state;

                    if (value != string.Empty)

                    {

                        this.airCleanerData.FilterPersent = Convert.ToInt32(value);