群控功能迭代

wxr

2023-07-20 8c28c3f43f91510e3a99189243c17717bdee1a0e

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs

@@ -1903,7 +1903,7 @@
            }
            LoadFunctionRow(onOffStatus);

            if (sceneFunction.localFunction.spk == SPK.LightRGB)
            if (sceneFunction.localFunction.spk == SPK.LightRGB || sceneFunction.localFunction.spk == SPK.GroupControl)
            {
                var colorfulStatus = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
                if (colorfulStatus != null)
@@ -1982,6 +1982,9 @@

            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                if (sceneFunction.localFunction.spk == SPK.GroupControl) { }
                else
                {
                if (isOnStatus)
                {
                    if (isColorful)
@@ -2001,11 +2004,10 @@
                }
                else
                {
                    if (isColorful) { } else { }
                    sceneFunction.status.Clear();
                    sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "off" });
                }

                }
                var temp = scene.functions.Find((obj) => obj.sid == sceneFunction.sid);
                
                if (temp != null)
@@ -2066,7 +2068,7 @@
                                {
                                    if (view.Tag.ToString() != FunctionAttributeKey.OnOff)
                                    {
                                        if (isColorful)
                                        if (isColorful && sceneFunction.localFunction.spk == SPK.LightRGB)
                                        {
                                            if(view.Tag.ToString() != FunctionAttributeKey.Colorful)
                                            {