From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index a161414..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,7 +548,7 @@
             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);
@@ -565,6 +571,31 @@
                 }
             }
 
+            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