Merge branch 'release0123' into wxr0114

wxr

2022-05-26 e34270918f2e831048114ecdfcfec3e3cdbb6fd7

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

@@ -26,8 +26,8 @@
                            if (!bodyView.onDimmerBar)

                            {

                                bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));

                            }
                            bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                            }

                            bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";

                            bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);

                        }

                        else

@@ -38,8 +38,8 @@
                        bodyView.barColorTemplatrue.Enable = updataTemp.trait_on_off.curValue.ToString() == "on";

                        var cct = 27;

                        int.TryParse(updataTemp.GetAttrState(FunctionAttributeKey.CCT), out cct);

                        bodyView.barColorTemplatrue.Progress = cct / 100;
                        //设置初始值
                        bodyView.barColorTemplatrue.Progress = cct / 100;

                        //设置初始值

                        bodyView.barColorTemplatrue.SetCustomText(bodyView.barColorTemplatrue.Progress * 100 + "K");



                    }

@@ -59,7 +59,7 @@
            LoadEvet_ChangeFadeTime();

            LoadEvet_ChangeColorTemplatrue();

            //回退刷新信息事件

            actionRefresh = () =>
            actionRefresh = () =>

            {

                btnFunctionName.Text = btnFunctionName_Out.Text = function.name;

                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();

@@ -71,54 +71,54 @@
        /// </summary>

        void LoadEvet_ChangeFadeTime()

        {

            if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
            {
                barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
                {
                    function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
                    function.SaveFunctionFile();
                };
            }
            if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)

            {

                barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>

                {

                    function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());

                    function.SaveFunctionFile();

                };

            }

        }



        /// <summary>

        /// 修改色温

        /// </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(() =>
                {
                    Application.RunOnMainThread(() =>
                    {
                        //设置自定义的文本
                        barColorTemplatrue.SetCustomText(value * 100 + "K");
                        function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
                        //System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                        //d.Add(FunctionAttributeKey.CCT, function.Attr_CCT.curValue.ToString());
                        //Control.Ins.SendWriteCommand(function, d);
                new System.Threading.Thread(() =>

                {

                    Application.RunOnMainThread(() =>

                    {

                        //设置自定义的文本

                        barColorTemplatrue.SetCustomText(value * 100 + "K");

                        function.SetAttrState(FunctionAttributeKey.CCT, value * 100);

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

                        //d.Add(FunctionAttributeKey.CCT, function.Attr_CCT.curValue.ToString());

                        //Control.Ins.SendWriteCommand(function, d);

                    });

                    //System.Threading.Thread.Sleep(200);

                }).Start();

            };

            };



            barColorTemplatrue.OnStopTrackingTouchEvent = (sender, value) =>

            {
                function.SetAttrState(FunctionAttributeKey.CCT, value * 100);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.CCT, (value * 100 ).ToString());
                Control.Ins.SendWriteCommand(function, d);
            {

                function.SetAttrState(FunctionAttributeKey.CCT, value * 100);

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

                d.Add(FunctionAttributeKey.CCT, (value * 100 ).ToString());

                Control.Ins.SendWriteCommand(function, d);

            };



        }

@@ -139,74 +139,79 @@
        /// </summary>

        void LoadEvent_DimmerBar()

        {

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

                d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());

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

                if (dimmerBar.Progress > 0)

                {

                    d.Add(FunctionAttributeKey.OnOff, "on");

                }

                Control.Ins.SendWriteCommand(function, d);

                //function.fadeTime = barFadeTime.Progress;

                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) =>
                {
                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                //function.fadeTime = 0;
                //if (!btnSwitch.IsSelected)
                //{
                //    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                //}
                //btnSwitch.IsSelected = e > 0 ? true : false;
                //function.brightness = e;
                //function.trait_on_off.curValue = e > 0 ? "on" : "off";

                //if (e == 0 || e == 100)
                //{
                //    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                //    d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
                //    Control.Ins.SendWriteCommand(function, d);
                //}
                //else
                //{
                //    if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                //    {
                //        function.refreshTime = DateTime.Now;
                //        new System.Threading.Thread(() =>
                //        {
                //            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                //            d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
                //            Control.Ins.SendWriteCommand(function, d);
                //        })
                //        { IsBackground = true }.Start();
                //    }
                //}

                //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);
                //btnBrightnessText.Text = function.brightness + "%";

                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
                    btnBrightnessText.Text = dimmerBar.Progress + "%";
                };

                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) =>

                {

                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);

                //function.fadeTime = 0;

                //if (!btnSwitch.IsSelected)

                //{

                //    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);

                //}

                //btnSwitch.IsSelected = e > 0 ? true : false;

                //function.brightness = e;

                //function.trait_on_off.curValue = e > 0 ? "on" : "off";



                //if (e == 0 || e == 100)

                //{

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

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

                //    Control.Ins.SendWriteCommand(function, d);

                //}

                //else

                //{

                //    if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds)

                //    {

                //        function.refreshTime = DateTime.Now;

                //        new System.Threading.Thread(() =>

                //        {

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

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

                //            Control.Ins.SendWriteCommand(function, d);

                //        })

                //        { IsBackground = true }.Start();

                //    }

                //}



                //btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16 - 16) / 100) + Application.GetRealWidth(40);

                //btnBrightnessText.Text = function.brightness + "%";



                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);

                    btnBrightnessText.Text = dimmerBar.Progress + "%";

                };



            }

        }



@@ -216,16 +221,16 @@
        void LoadSwitchEvent()

        {

            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;