From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42

---
 HDL_ON/Entity/Function/Scene.cs |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 04888ab..c2844b4 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -632,6 +632,32 @@
             {
                 sceneFunctionInfo += " " + perAngle.value + "掳";
             }
+
+            var perSetVolume = status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
+            if (perSetVolume != null)
+            {
+                sceneFunctionInfo += " " + perSetVolume.value;
+            }
+
+            var perSignal = 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 =status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
+            if (perVolume != null)
+            {
+                sceneFunctionInfo += " " + perVolume.value;
+            }
+
+            var perSongName =status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
+            if (perSongName != null)
+            {
+                sceneFunctionInfo += " " + perSongName.value;
+            }
             return sceneFunctionInfo;
         }
 
@@ -706,6 +732,18 @@
                 case "security":
                     text = Language.StringByID(StringId.DeploymentStatus);
                     break;
+                case FunctionAttributeKey.SetVolume:
+                    text = Language.StringByID(StringId.yinliang);
+                    break;
+                case FunctionAttributeKey.Signal:
+                    text = Language.StringByID(StringId.xinhaoyuan);
+                    break;
+                case FunctionAttributeKey.Volume:
+                    text = Language.StringByID(StringId.yinliang);
+                    break;
+                case FunctionAttributeKey.SongName:
+                    text = Language.StringByID(StringId.tishiyin);
+                    break;
             }
             return text;
         }
@@ -717,7 +755,7 @@
         /// </summary>
         public string GetUintString()
         {
-            if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
+            if (!string.IsNullOrEmpty(UintString) && UintString != "{}")
             {
                 return UintString;
             }
@@ -851,6 +889,20 @@
                 case "auto":
                     text = Language.StringByID(StringId.Auto);
                     break;
+                case FunctionAttributeKey.Signal:
+                    var p = new UI.UI2.Intelligence.Automation.PublicInterface();
+                    var dic = p.GetHisenseSignalSourceDic();
+                    text = p.GetKey(dic, value);
+                    break;
+                case FunctionAttributeKey.SetVolume:
+                    text = value;
+                    break;
+                case FunctionAttributeKey.Volume:
+                    text = value;
+                    break;
+                case FunctionAttributeKey.SongName:
+                    text = value;
+                    break;
             }
             return text;
         }

--
Gitblit v1.8.0