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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 2fd46a9..c2844b4 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -151,6 +151,7 @@
/// 閰嶅悎璞嗚眴淇敼浜戠鏁版嵁
/// 璋冭瘯瀹濄�乷n pro鍜屽钩鍙板搴�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public List<SceneImageInfo> OssSceneImages = new List<SceneImageInfo>()
{
new SceneImageInfo
@@ -631,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;
}
@@ -705,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;
}
@@ -716,7 +755,7 @@
/// </summary>
public string GetUintString()
{
- if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
+ if (!string.IsNullOrEmpty(UintString) && UintString != "{}")
{
return UintString;
}
@@ -726,7 +765,7 @@
{
case FunctionAttributeKey.SetTemp:
case FunctionAttributeKey.RoomTemp:
- us = "掳";
+ us = "掳C";
break;
case FunctionAttributeKey.Percent:
case FunctionAttributeKey.Brightness:
@@ -850,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