群控功能迭代

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,30 +1982,32 @@

            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                if (isOnStatus)
                if (sceneFunction.localFunction.spk == SPK.GroupControl) { }
                else
                {
                    if (isColorful)
                    if (isOnStatus)
                    {
                        sceneFunction.status.Clear();
                        sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "on" });
                        sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.Colorful, value = "on" });
                        if (isColorful)
                        {
                            sceneFunction.status.Clear();
                            sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "on" });
                            sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.Colorful, value = "on" });
                        }
                        else
                        {
                            var isHasColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
                            if (isHasColorful != null)
                            {
                                sceneFunction.status.Remove(isHasColorful);
                            }
                        }
                    }
                    else
                    {
                        var isHasColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
                        if (isHasColorful != null)
                        {
                            sceneFunction.status.Remove(isHasColorful);
                        }
                        sceneFunction.status.Clear();
                        sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "off" });
                    }
                }
                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)
@@ -2051,7 +2053,7 @@

        void UpdataFunctionRow()
        {
            for(var i =0;i< functionRowList.Count; i++)
            for (var i =0;i< functionRowList.Count; i++)
            {
                try
                {
@@ -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)
                                            {