代码同步

wxr

2022-03-11 b079d370b3c23751a5d200dc2d25f6c80977b4d4

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

@@ -86,6 +86,16 @@
        /// </summary>

        void LoadEvet_ChangeColorTemplatrue()

        {

            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(() =>
@@ -129,11 +139,18 @@
        /// </summary>

        void LoadEvent_DimmerBar()

        {

            dimmerBar.OnStartTrackingTouchEvent = (sender, e) => {

                onDimmerBar = true;

            };

            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
            {

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

                onDimmerBar = false;

                function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);

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

@@ -143,6 +160,12 @@
                btnBrightnessText.Text = dimmerBar.Progress + "%";

                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
            };
            if (function.online)
            {
                dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
                {
                    onDimmerBar = true;
            };

            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {

@@ -184,7 +207,7 @@
                btnBrightnessText.Text = dimmerBar.Progress + "%";

            };





            }

        }



        /// <summary>

@@ -194,6 +217,16 @@
        {

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

            {

                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)