Merge branch 'Dev-Branch-2024' into wjc

mac

2024-07-25 16bea1d248f0010049bceaa562939297fa26b130

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

@@ -32,7 +32,7 @@
            
            bodyView = this;
            scene = s;
            sceneFunction = fc;//.localFunction.ConvertSceneFunction(); 
            sceneFunction = fc.localFunction.ConvertSceneFunction(); 
            foreach (var ll in sceneFunction.status)
            {
                try
@@ -248,6 +248,17 @@

                    if (sceneFunction.localFunction.spk == SPK.MusicStandard)
                    {
                        for (var i = 0; i < sceneFunction.status.Count;)
                        {
                            var ddd = sceneFunction.status[i];
                            if (string.IsNullOrEmpty(ddd.value))
                            {
                                sceneFunction.status.Remove(ddd);
                                continue;
                            }
                            i++;
                        }

                        if (sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.PlaylistName) == null)
                        {
                            if (isOnStatus)