From 5ec581e5d37b108fc9d59e89afd8e94e21b32080 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 17 十月 2023 17:33:36 +0800
Subject: [PATCH] 2023年10月17日17:33:33
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 9bc1eb7..4586b64 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -468,10 +468,16 @@
EventHandler<MouseEventArgs> skipEvent= (sender, e) =>
{
- var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
- MainPage.BasePageView.AddChidren(ssf);
- ssf.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ try
+ {
+ var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
+ MainPage.BasePageView.AddChidren(ssf);
+ ssf.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }catch(Exception ex)
+ {
+ MainPage.Log($"load SceneFunctionInfoEditPage error : {ex.Message}");
+ }
};
btnFunctionName.MouseUpEventHandler = skipEvent;
@@ -542,18 +548,54 @@
var perAngle = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
if (perAngle != null)
{
- sceneFunctionInfo += " "+ perState.value + "掳";
+ sceneFunctionInfo += " "+ perAngle.value + "掳";
}
var perColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
if(perColorful != null)
{
- if(perColorful.value == "on")
+ if (perColorful.value == "on")
+ {
sceneFunctionInfo += " " + Language.StringByID(StringId.HorseRaceLamp);
+ }
else
- sceneFunctionInfo = Language.StringByID(StringId.Close) + " " + Language.StringByID(StringId.HorseRaceLamp);
+ {
+ if (sceneFunction.localFunction.spk == SPK.GroupControl)
+ {
+ sceneFunctionInfo += " " + Language.StringByID(StringId.Close) + " " + Language.StringByID(StringId.HorseRaceLamp);
+ }
+ else
+ {
+ sceneFunctionInfo = Language.StringByID(StringId.Close) + " " + Language.StringByID(StringId.HorseRaceLamp);
+ }
+ }
}
+ var perSetVolume = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
+ if (perSetVolume != null)
+ {
+ sceneFunctionInfo += " " + perSetVolume.value ;
+ }
+
+ var perSignal = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Signal);
+ if (perSignal != null)
+ {
+ var p = new HDL_ON.UI.UI2.Intelligence.Automation.PublicInterface();
+ string key = p.GetKey(p.GetHisenseSignalSourceDic(), perSignal.value);
+ sceneFunctionInfo += " " + key;
+ }
+
+ var perVolume = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
+ if (perVolume != null)
+ {
+ sceneFunctionInfo += " " + perVolume.value;
+ }
+
+ var perSongName = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
+ if (perSongName != null)
+ {
+ sceneFunctionInfo += " " + perSongName.value;
+ }
return sceneFunctionInfo;
}
--
Gitblit v1.8.0