Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-09-14 9eec81850e418a3c16410b4870910bde142b06e3

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs

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

        void LoadEvet_ChangeColorTemplatrue()

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

            if (!function.online)

            {

                new Tip()

                {

                    CloseTime = 1,

                    Text = Language.StringByID(StringId.DeviceOfflineCannotOption),

                    Direction = AMPopTipDirection.None,

                }.Show(MainPage.BaseView);

                return;

            }

            barColorTemplatrue.OnProgressChangedEvent += (sender, value) =>

            {

                new System.Threading.Thread(() =>
@@ -145,16 +145,16 @@
        {

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

                if (!function.online)

                {

                    new Tip()

                    {

                        CloseTime = 1,

                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),

                        Direction = AMPopTipDirection.None,

                    }.Show(MainPage.BaseView);

                    return;

                }
                //onDimmerBar = false;

                    curDimmerStatus = false;
                function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);

@@ -223,16 +223,16 @@
        {

            btnSwitch.MouseUpEventHandler += (sender, e) =>

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

                if (!function.online)

                {

                    new Tip()

                    {

                        CloseTime = 1,

                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),

                        Direction = AMPopTipDirection.None,

                    }.Show(MainPage.BaseView);

                    return;

                }

                //function.fadeTime = barFadeTime.Progress;

                btnSwitch.IsSelected = !btnSwitch.IsSelected;

                if (btnSwitch.IsSelected)

@@ -248,15 +248,14 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";

                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());

                    d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));

                    if (btnSwitch.IsSelected)

                    {

                        d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());

                    }

                    else

                    {

                        function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));

                    }

                    //if (btnSwitch.IsSelected)

                    //{

                    //    d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());

                    //}

                    //else

                    //{

                    //    function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));

                    //}

                    Control.Ins.SendWriteCommand(function, d);

                })

                { IsBackground = true }.Start();