版本合并冲突修改

wxr

2022-06-30 cda315b3a19919cae922bdbe96bc20eab4e29fcc

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

@@ -540,16 +540,16 @@
        /// <param name="value">auto:自动  sleep:睡眠  manual:手动  strong:强烈</param>

        private void SendModeComand(string value)

        {
            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.btnMode.CanClick = false;

            HdlThreadLogic.Current.RunThread(() =>

            {

@@ -569,16 +569,16 @@
        /// <param name="value">canel:取消 1:1小时 2:2小时 3:4小时 4:8小时</param>

        private void SendTimingComand(string value)

        {
            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.btnTime.CanClick = false;

            HdlThreadLogic.Current.RunThread(() =>

            {

@@ -598,16 +598,16 @@
        /// <param name="value">1:低档 2:中档 3:高档</param>

        private void SendFanSpeedComand(string value)

        {
            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.btnFan.CanClick = false;

            HdlThreadLogic.Current.RunThread(() =>

            {

@@ -626,16 +626,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.btnPictrue.CanClick = false;

            this.btnSwitch.CanClick = false;



@@ -663,16 +663,16 @@
        /// </summary>

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

        {
            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;
            //}

            if (btnSwitch != null)

            {

                btnSwitch.CanClick = false;