From 87d8d4adb1dd948c2beebdc9c4b84a7d426b60cc Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 九月 2023 10:55:08 +0800
Subject: [PATCH] 2023年09月25日10:54:27
---
HDL_ON/Entity/Function/Function.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 31a5117..e07df39 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -108,6 +108,7 @@
/// 鑾峰彇灞炴�у綋鍓嶇姸鎬�
/// </summary>
/// <param name="key"></param>
+ /// <param name="defaultValue">榛樿鍊�</param>
/// <returns></returns>
public string GetAttrState(string key, string defaultValue = "0")
{
@@ -120,7 +121,7 @@
if (string.IsNullOrEmpty(attrState.state))
{
//浜岀骇鏌ヨkeyValue鍊�
- return GetOriginalState(key);
+ return GetOriginalState(key, defaultValue);
}
return attrState.state;
}
@@ -130,13 +131,14 @@
/// 榛樿鍊硷細0
/// </summary>
/// <param name="key">璇泙瀹氫箟鐨勫睘鎬у��</param>
+ /// <param name="defaultValue">榛樿鍊�</param>
/// <returns></returns>
- public string GetOriginalState(string key)
+ public string GetOriginalState(string key, string defaultValue)
{
var originalState = status.Find((s) => s.key == key.ToString());
if (originalState == null || string.IsNullOrEmpty(originalState.value))
{
- return "0";
+ return defaultValue;
}
return originalState.value;
}
@@ -449,7 +451,7 @@
public bool online {
get
{
- if (spk == SPK.AirSwitchP3)
+ if (spk == SPK.AirSwitchP3|| spk == SPK.ElectricalTvHisense)
{
return _online;
}
@@ -860,9 +862,24 @@
}
}
}
- else if (spk == SPK.MusicStandard|| spk == SPK.AvMusic)
+ else if (spk == SPK.MusicStandard || spk == SPK.AvMusic)
{
- list.AddRange(attributes);
+ list.Add(new FunctionAttributes
+ {
+ key = FunctionAttributeKey.OnOff,
+ curValue = string.Empty,
+ });
+ list.Add(new FunctionAttributes
+ {
+ key = FunctionAttributeKey.Volume,
+ curValue = string.Empty,
+ });
+ list.Add(new FunctionAttributes
+ {
+ key = FunctionAttributeKey.SongName,
+ curValue = string.Empty,
+ });
+
}
else if (spk == SPK.ElectricalTvHisense)
{
@@ -962,7 +979,8 @@
switch (attr.key)
{
-
+ case FunctionAttributeKey.SongName:
+ case FunctionAttributeKey.Volume:
case FunctionAttributeKey.SetVolume:
case FunctionAttributeKey.Signal:
case FunctionAttributeKey.OnOff:
@@ -1042,6 +1060,11 @@
/// 鏇存柊鏃堕棿
/// </summary>
public DateTime refreshTime = DateTime.MinValue;
+ /// <summary>
+ /// 鏈�鍚庢洿鏂扮姸鎬佺殑鏃堕棿
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public DateTime updateTime = DateTime.MinValue;
/// <summary>
/// 鑾峰彇鏈湴鎺у埗鏁版嵁
@@ -1611,6 +1634,24 @@
/// </summary>
public const string Signal = "signal";
+ /// <summary>
+ /// 闊充箰闊抽噺
+ /// </summary>
+ public const string Volume = "volume";
+ /// <summary>
+ /// 姝屾洸鍚�
+ /// </summary>
+ public const string SongName = "song_name";
+ /// <summary>
+ /// 鍒楄〃鍚�
+ /// </summary>
+ public const string PlaylistName = "playlist_name";
+ /// <summary>
+ /// 鎾斁璺緞
+ /// </summary>
+ public const string Url = "url";
+
+
}
/// <summary>
/// 璁惧鍔熻兘oid
@@ -2158,6 +2199,7 @@
spkList.Add(SensorEnvironment2);
spkList.Add(SensorEnvironment3);
spkList.Add(SensorHcho);
+ spkList.Add(SensorLight);
return spkList;
}
/// <summary>
@@ -2174,6 +2216,7 @@
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
spkList.Add(SensorHcho);
+ spkList.Add(SensorLight);
return spkList;
}
@@ -2187,6 +2230,7 @@
spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
spkList.Add(SensorEnvironment2);
spkList.Add(SensorEnvironment3);
+
return spkList;
}
--
Gitblit v1.8.0