2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

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

@@ -87,7 +87,7 @@
            controlView = new FrameLayout()

            {

                Gravity = Gravity.CenterHorizontal,

                Y = Application.GetRealHeight(88),

                Y = Application.GetRealHeight(88 + 10),

                Width = Application.GetRealWidth(327),

                Height = Application.GetRealHeight(526),

                BackgroundImagePath = "Public/Fragmentbg.png",

@@ -354,20 +354,19 @@
            new System.Threading.Thread(() => {
                while (true)
                {
                    System.Threading.Thread.Sleep(500);
                    System.Threading.Thread.Sleep(500);
                    System.Threading.Thread.Sleep(1000);
                    if (curDimmerStatus)
                    {
                        continue;
                    }
                    if (onDimmerBar)
                    {
                        onDimmerBar = false;
                        continue;
                    }
                    else
                    {
                        DriverLayer.Control.Ins.SendReadCommand(function);
                        curDimmerStatus = true;
                    }
                }
            })
@@ -486,13 +485,13 @@
                btnShortcut.UnSelectedImagePath = "FunctionIcon/Light/MeetingGuestsIconOn.png";

            };



            //会客 3000k

            //会客 4500k

            var btnMeet = new Button();

            btnMeet.X = btnMeetIcon.Right + Application.GetRealWidth(12);

            btnMeet.Y = btnMeetIcon.Y;

            btnMeet.Width = Application.GetRealWidth(100);

            btnMeet.Height = Application.GetRealWidth(24);

            btnMeet.Text = Language.StringByID(StringId.MeetingGuests) + " 3000K";

            btnMeet.Text = Language.StringByID(StringId.MeetingGuests) + " 4500K";

            btnMeet.TextSize = CSS_FontSize.TextFontSize;

            btnMeet.TextColor = CSS_Color.FirstLevelTitleColor;

            btnMeet.SelectedTextColor = CSS_Color.MainColor;

@@ -500,7 +499,7 @@
            frameWhite.AddChidren(btnMeet);

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

            {

                barColorTemplatrue.Progress = 30;

                barColorTemplatrue.Progress = 45;

                function.SetAttrState(FunctionAttributeKey.CCT, barColorTemplatrue.Progress * 100);

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

                frameBack.Close();
@@ -564,7 +563,7 @@
                btnCozy.IsSelected = true;
                btnCozyIcon.IsSelected = true;
            }
            if (function.GetAttrState(FunctionAttributeKey.CCT) == "3000")
            if (function.GetAttrState(FunctionAttributeKey.CCT) == "4500")
            {
                btnMeet.IsSelected = true;
                btnMeetIcon.IsSelected = true;