版本合并冲突修改

wxr

2022-06-30 cda315b3a19919cae922bdbe96bc20eab4e29fcc

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs

@@ -759,15 +759,15 @@
        /// <param name="comadValue">命令</param>
        private void SendOtherComand(IconViewControl btnIcon, string comadKey, string comadValue)
        {
            if (!device.online)
            {
                new Tip()
                {
                    CloseTime = 1,
                    Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                    Direction = AMPopTipDirection.None,
                }.Show(MainPage.BaseView);
            }
            //if (!device.online)
            //{
            //    new Tip()
            //    {
            //        CloseTime = 1,
            //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
            //        Direction = AMPopTipDirection.None,
            //    }.Show(MainPage.BaseView);
            //}
            btnIcon.CanClick = false;

            HdlThreadLogic.Current.RunThread(() =>
@@ -788,15 +788,15 @@
        /// </summary>
        private void SendSwitchComand()
        {
            if (!device.online)
            {
                new Tip()
                {
                    CloseTime = 1,
                    Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                    Direction = AMPopTipDirection.None,
                }.Show(MainPage.BaseView);
            }
            //if (!device.online)
            //{
            //    new Tip()
            //    {
            //        CloseTime = 1,
            //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
            //        Direction = AMPopTipDirection.None,
            //    }.Show(MainPage.BaseView);
            //}
            this.btnSwitch.CanClick = false;

            string statu = this.btnSwitch.IsSelected == true ? "off" : "on";