群控更新bug修复

wxr

2023-07-24 b6fdafae7a4d67ea44bbf8cc27563bca3244de4e

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

@@ -33,8 +33,15 @@
            }
        }

        public override void RemoveFromParent()
        {
            base.RemoveFromParent();
        }

        public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
        {
            bodyView.RemoveAll();

            btnCollection_Out = btnCollectionIcon;
            btnFunctionName_Out = btnFunctionNameOut;
            btnFromFloor_Out = btnFromFloorOut;
@@ -93,6 +100,7 @@
            //};


           

            //回退刷新信息事件
            new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_SettingIcon( () => {
@@ -104,9 +112,22 @@
                                {
                                    if (newGC != null)
                                    {
                                        btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
                                        function.roomIds = newGC.uids;
                                        btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = newGC.GetUidListName();
                                        var localTemp = FunctionList.List.groupControls.Find((obj) => obj.deviceId == newGC.deviceId);
                                        if(localTemp!= null)
                                        {
                                            try
                                            {
                                                localTemp.sids = newGC.sids;
                                                localTemp.name = newGC.name;
                                                localTemp.roomIds = newGC.roomIds;
                                                localTemp.uids = newGC.uids;
                                            }
                                            catch { }
                                            function = newGC;
                                            btnFunctionName_Out.Text = function.name;
                                            btnFromFloor_Out.Text = function.GetRoomListName();
                                            LoadPage(btnCollection, btnFunctionName, btnFunctionName);
                                        }
                                    }
                                });
                            }
@@ -178,17 +199,14 @@
            }

            //属性设置区域
            var attrView = new VerticalScrolViewLayout()
            VerticalScrolViewLayout attrView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(52),
                Width = Application.GetRealWidth(343),
                ScrollEnabled = false,
            };
            //属性设置区域高度
            int attrViewHight = Application.GetRealHeight(18 + 22);


            controlView.AddChidren(attrView);

            attrView.AddChidren(new Button() { Height = Application.GetRealHeight(18) });

            btnSwitch = new Button()
@@ -217,7 +235,6 @@
                    function.Control(d);
                }
            };



            if (hadRGB)
@@ -267,7 +284,6 @@
                    btnSwitchIcon.IsSelected = btnSwitch.IsSelected;
                };
            }




@@ -369,6 +385,8 @@
                {
                    dimmerBar.Progress = 0;
                }
                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100);
                btnBrightnessText.Text = dimmerBar.Progress + "%";
            };

        }
@@ -466,6 +484,8 @@
                {
                    dimmerBar.Progress = 0;
                }
                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100);
                btnBrightnessText.Text = dimmerBar.Progress + "%";
            };

            //attrView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
@@ -722,6 +742,47 @@
            };
            controlView.AddChidren(dimmerBar);


            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {
                if (e == 0 && lastBrightness != 0)
                {
                    btnSwitch.IsSelected = false;
                    lastBrightness = 0;
                }
                else
                {
                    if (lastBrightness == 0)
                        lastBrightness = e;
                    btnSwitch.IsSelected = true;
                }
                if (e == 0 || e == 100)
                {
                    var d = new Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.Brightness, e.ToString());
                    function.Control(d);
                }
                else
                {
                    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                    {
                        function.refreshTime = DateTime.Now;
                        new System.Threading.Thread(() =>
                        {
                            var d = new Dictionary<string, string>();
                            d.Add(FunctionAttributeKey.Brightness, e.ToString());
                            function.Control(d);
                        })
                        { IsBackground = true }.Start();
                    }
                }


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


            var btnMaxValuesText = new Button()
            {
                X = dimmerBar.Right,
@@ -734,6 +795,17 @@
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
            };
            controlView.AddChidren(btnMaxValuesText);

            btnSwitch.MouseUpEventHandler += (sender, e) => {
                if (btnSwitch.IsSelected)
                {
                    dimmerBar.Progress = 100;
                }
                else
                {
                    dimmerBar.Progress = 0;
                }
            };
            #endregion

            int heightMore = 375 - magriHeight-20;
@@ -799,6 +871,7 @@
                };
                barColorTemplatrue.MinValue = 27;
                barColorTemplatrue.MaxValue = 65;
                barColorTemplatrue.Progress = 38;
                barColorTemplatrue.ProgressBarColor = 0x00000000;//全部透明
                barColorTemplatrue.ProgressBarUnEnableColor = 0x00000000;
                barColorTemplatrue.SeekBarBackgroundColor = 0x00000000;
@@ -845,7 +918,7 @@
                var btnGradualChangeText = new Button()
                {
                    X = Application.GetRealWidth(35),
                    Y = Application.GetRealHeight(375 + heightMore - magriHeight),
                    Y = hadCCT ? Application.GetRealHeight(375 + heightMore - magriHeight) : Application.GetRealHeight(heightMore+10),
                    Width = Application.GetRealWidth(224),
                    Height = Application.GetRealHeight(21),
                    TextAlignment = TextAlignment.CenterLeft,
@@ -874,9 +947,11 @@

                var barColorful = new FrameLayout()
                {
                    X = btnColorfulEdit.Right + Application.GetRealWidth(15+5),
                    Y = Application.GetRealHeight(412 + heightMore - magriHeight),
                    X = btnColorfulEdit.Right + Application.GetRealWidth(15 + 5),
                    Width = Application.GetRealWidth(170),
                    //X = Application.GetRealWidth(35),
                    //Width = Application.GetRealWidth(170 + 41),
                    Y = hadCCT ? Application.GetRealHeight(412 + heightMore - magriHeight) : Application.GetRealHeight(heightMore + 50),
                    Height = Application.GetRealHeight(8),
                    BackgroundImagePath = "FunctionIcon/Light/ColorfulBar.png",
                };