版本合并冲突修改

wxr

2022-06-30 cda315b3a19919cae922bdbe96bc20eab4e29fcc

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

@@ -99,7 +99,7 @@
            //档

            var strView = Language.StringByID(StringId.Gear);

            if (device.online)
            //if (device.online)
            {
                seekBarContr.ProgressChangedEvent += (div, value) =>
                {
@@ -179,16 +179,16 @@
        /// </summary>

        private void SendSwitchComand()

        {
            if (!device.online)
            {
                new Tip()
                {
                    CloseTime = 1,
                    Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                    Direction = AMPopTipDirection.None,
                }.Show(MainPage.BaseView);
                return;
            }

            //if (!device.online)
            //{
            //    new Tip()
            //    {
            //        CloseTime = 1,
            //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
            //        Direction = AMPopTipDirection.None,
            //    }.Show(MainPage.BaseView);
            //    return;
            //}

            this.btnSwitch.CanClick = false;



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