Merge branch 'release0123' into wxr0114

wxr

2022-06-27 4047f825119fd65a8ed41ade4b2324d8a7f94902

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

@@ -27,8 +27,11 @@
                            {

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

                            }

                            if (updataTemp.GetAttrState(FunctionAttributeKey.Brightness) != "0")

                            {

                            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

                        {

@@ -134,6 +137,7 @@
            };

        }



        bool curDimmerStatus = false;

        /// <summary>

        /// 灯光调光事件

        /// </summary>

@@ -141,17 +145,18 @@
        {

            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;

                //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);

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

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