From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 08820bd..e0f5a35 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
@@ -195,33 +195,10 @@
}
else
{
- if (sceneFunction.localFunction.spk == SPK.ElectricalTvHisense)
+ var isHasColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
+ if (isHasColorful != null)
{
- for(int i = 0;i< sceneFunction.status.Count;i++)
- {
- var tvState = sceneFunction.status[i];
- if (tvState.key == FunctionAttributeKey.OnOff)
- {
- tvState.key = "wol";
- tvState.value = "on";
- }
- else
- {
- if(string.IsNullOrEmpty( tvState.value))
- {
- sceneFunction.status.RemoveAt(i);
- i--;
- }
- }
- }
- }
- else
- {
- var isHasColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
- if (isHasColorful != null)
- {
- sceneFunction.status.Remove(isHasColorful);
- }
+ sceneFunction.status.Remove(isHasColorful);
}
}
}
@@ -243,9 +220,38 @@
{
scene.functions.Remove(temp);
}
- //else
- {
scene.functions.Insert(0, sceneFunction);
+
+
+ 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)
+ {
+ var songNameStatus = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
+ {
+ if (songNameStatus != null)
+ {
+ if (string.IsNullOrEmpty(songNameStatus.value))
+ {
+ sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.PlaylistName, value = "hdl_special" });
+ }
+ }
+ }
+ }
+ }
}
if (!string.IsNullOrEmpty(scene.userSceneId))
{
--
Gitblit v1.8.0