From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 15:27:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index d6bcd74..6232dd0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/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)
--
Gitblit v1.8.0