From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/Entity/Function/Function.cs | 460 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 440 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index f180034..7bcc154 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -100,7 +100,7 @@
/// <returns></returns>
public FunctionAttributes GetAttribute(string key)
{
- var attr = attributes.Find((a) => a.key == key);
+ var attr = GetFunctionAttributes().Find((a) => a.key == key);
return attr;
}
@@ -108,8 +108,9 @@
/// 鑾峰彇灞炴�у綋鍓嶇姸鎬�
/// </summary>
/// <param name="key"></param>
+ /// <param name="defaultValue">榛樿鍊�</param>
/// <returns></returns>
- public string GetAttrState(string key , string defaultValue = "0")
+ public string GetAttrState(string key, string defaultValue = "0")
{
//涓�绾ф煡璇eyValue鍊�
var attrState = attributes.Find((s) => s.key == key.ToString());
@@ -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;
}
@@ -171,6 +173,16 @@
string iconPath = spk.Replace(".", "");
switch (spk)
{
+ case SPK.SensorDryContact2:
+ case SPK.OtherCommon:
+ iconPath = "sensordryContact";
+ break;
+ //case SPK.SensorLight:
+ // iconPath = "lightswitch";
+ // break;
+ case SPK.AirSwitchP3:
+ iconPath = "electricalbreaker";
+ break;
case SPK.PanelSocket:
iconPath = "electricalsocket";
break;
@@ -277,6 +289,10 @@
/// </summary>
public string extDevId = string.Empty;
/// <summary>
+ /// 鐗╃悊璁惧(妯″潡)鍨嬪彿
+ /// </summary>
+ public string omodel = string.Empty;
+ /// <summary>
/// 璁惧spk
/// </summary>
public string spk = "";
@@ -369,6 +385,39 @@
/// </summary>
public List<FunctionAttributes> attributes = new List<FunctionAttributes>();
+ public List<FunctionAttributes> GetFunctionAttributes()
+ {
+ if (spk == SPK.GroupControl)
+ {
+ var list = new List<FunctionAttributes>();
+ var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ if (gc != null)
+ {
+ foreach (var temp in gc.sids)
+ {
+ var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
+ if (light != null)
+ {
+ foreach (var attr in light.attributes)
+ {
+ if (list.Find((obj) => obj.key == attr.key) == null)
+ {
+ list.Add(attr);
+ }
+ }
+ }
+ }
+ }
+
+ return list;
+ }
+ else
+ {
+ return attributes;
+ }
+ }
+
+
/// <summary>
/// 鎴块棿ID鍒楄〃
/// 璇ュ姛鑳芥坊鍔犲埌鍒版埧闂村垪琛�
@@ -405,20 +454,52 @@
/// </summary>
public bool collect = false;
- private bool _online = false;
- /// <summary>
- /// 鏄惁鍦ㄧ嚎
- /// </summary>
- public bool online
- {
+ private bool _online;
+ public bool online {
get
{
+ if (spk == SPK.AirSwitchP3|| spk == SPK.ElectricalTvHisense)
+ {
+ return _online;
+ }
return true;
}
set
{
_online = value;
}
+ }
+ ///// <summary>
+ ///// 鏄惁鍦ㄧ嚎
+ ///// </summary>
+ //public bool online
+ //{
+ // get
+ // {
+ // if(spk == SPK.AirSwitchP3)
+ // {
+ // return _online;
+ // }
+ // return true;
+ // }
+ // set
+ // {
+ // _online = value;
+ // }
+ //}
+
+ public bool isOnline()
+ {
+ if (spk == SPK.AirSwitchP3)
+ {
+ return online;
+ }
+ return true;
+ }
+
+ public void setOnine(bool isOnline)
+ {
+ online = isOnline;
}
/// <summary>
@@ -690,9 +771,9 @@
/// <summary>
/// 淇濆瓨鎴块棿缁戝畾淇℃伅
/// </summary>
- public void UpdataRoomIds()
+ public async void UpdataRoomIds()
{
- new System.Threading.Thread(() =>
+ new System.Threading.Thread( () =>
{
var pack = ApiUtlis.Ins.HttpRequest.UpdataDevcieBindRoomInfo(this);
//鐩存帴淇濆瓨鏈湴锛�
@@ -762,8 +843,80 @@
public SceneFunction ConvertSceneFunction()
{
var sFunc = new SceneFunction();
- foreach (var attr in attributes)
+
+ var list = new List<FunctionAttributes>();
+ if (spk == SPK.GroupControl)
{
+ lock (list)
+ {
+ var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ if (gc != null)
+ {
+ foreach (var temp in gc.sids)
+ {
+ var tempDevice = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
+ if (tempDevice != null)
+ {
+ foreach (var attr in tempDevice.attributes)
+ {
+ if (list.Find((obj) => obj.key == attr.key) == null)
+ {
+ list.Add(attr);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ else if (spk == SPK.MusicStandard || spk == SPK.AvMusic)
+ {
+ 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)
+ {
+ list.Add(new FunctionAttributes
+ {
+ key = FunctionAttributeKey.OnOff,
+ curValue = string.Empty,
+ });
+ list.Add(new FunctionAttributes
+ {
+ key = FunctionAttributeKey.SetVolume,
+ curValue = string.Empty,
+ });
+ list.Add(new FunctionAttributes
+ {
+ key = FunctionAttributeKey.Signal,
+ curValue = string.Empty,
+ });
+ }
+ else
+ {
+ list.AddRange(attributes);
+ }
+
+ foreach (var attr in list)
+ {
+ if(attr.key == FunctionAttributeKey.ColorfulBegin || attr.key == FunctionAttributeKey.ColorfulEnd || attr.key == FunctionAttributeKey.ColorfulTime)
+ {
+ continue;
+ }
//绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
{
@@ -774,10 +927,69 @@
continue;
}
}
+ }else if (spk == SPK.GroupControl)
+ {
+ sFunc.type = "5";
}
switch (attr.key)
{
+ case FunctionAttributeKey.SetTemp:
+ var tt = GetAttribute(FunctionAttributeKey.TempType);
+ if (tt == null)
+ {
+ attr.unit = "掳C";
+ }
+ else
+ {
+ if (tt.unit == string.Empty)
+ {
+ attr.unit = "掳C";
+ }
+ else
+ {
+ if (tt.unit == "C")
+ {
+ attr.unit = "掳C";
+ }
+ else if (tt.unit == "F")
+ {
+ attr.unit = "掳F";
+ }
+ else
+ {
+ attr.unit = tt.unit;
+ }
+ }
+ }
+ break;
+ case FunctionAttributeKey.RoomTemp:
+ attr.unit = "掳C";
+ var tempType = attributes.Find((obj) => obj.key == FunctionAttributeKey.TempType);
+ if (tempType != null)
+ {
+ attr.unit = tempType.curValue.ToString();
+ }
+ break;
+ case FunctionAttributeKey.Percent:
+ case FunctionAttributeKey.Brightness:
+ attr.unit = "%";
+ break;
+ case FunctionAttributeKey.CCT:
+ attr.unit = "K";
+ break;
+ case FunctionAttributeKey.Angle:
+ attr.unit = "掳";
+ break;
+ }
+
+
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.SongName:
+ case FunctionAttributeKey.Volume:
+ case FunctionAttributeKey.SetVolume:
+ case FunctionAttributeKey.Signal:
case FunctionAttributeKey.OnOff:
case FunctionAttributeKey.Brightness:
case FunctionAttributeKey.Mode:
@@ -787,11 +999,15 @@
case FunctionAttributeKey.CCT:
case FunctionAttributeKey.RGB:
case FunctionAttributeKey.Angle:
+ case FunctionAttributeKey.Colorful:
+ case FunctionAttributeKey.ColorfulBegin:
+ case FunctionAttributeKey.ColorfulEnd:
+ case FunctionAttributeKey.ColorfulTime:
case "security":
//case FunctionAttributeKey.FadeTime:
if (attr.curValue.ToString() == "{}")
{
- if (attr.key == FunctionAttributeKey.OnOff)
+ if (attr.key == FunctionAttributeKey.OnOff || attr.key == FunctionAttributeKey.Colorful)
{
attr.curValue = "off";
}
@@ -830,13 +1046,16 @@
{
vv = 26;
}
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min });
+ sFunc.status.Add(new SceneFunctionStatus() {
+ UintString = attr.unit,
+ key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min }) ;
}
else
{
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min });
+ sFunc.status.Add(new SceneFunctionStatus() {
+ UintString = attr.unit,
+ key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min });
}
-
break;
}
}
@@ -848,6 +1067,11 @@
/// 鏇存柊鏃堕棿
/// </summary>
public DateTime refreshTime = DateTime.MinValue;
+ /// <summary>
+ /// 鏈�鍚庢洿鏂扮姸鎬佺殑鏃堕棿
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public DateTime updateTime = DateTime.MinValue;
/// <summary>
/// 鑾峰彇鏈湴鎺у埗鏁版嵁
@@ -982,6 +1206,10 @@
/// 浜戠璐熻矗鐢熸垚
/// </summary>
public string deviceId = "0";
+ /// <summary>
+ /// 鍦ㄧ嚎鐘舵��
+ /// </summary>
+ public bool online = true;
public List<AttributesStatus> status = new List<AttributesStatus>();
}
/// <summary>
@@ -1041,6 +1269,10 @@
/// 褰撳墠鍊�
/// </summary>
public object curValue = new object();
+ /// <summary>
+ /// 灞炴�у崟浣�
+ /// </summary>
+ public string unit=string.Empty;
}
/// <summary>
@@ -1048,6 +1280,79 @@
/// </summary>
public static class FunctionAttributeKey
{
+ #region 涓夌浉绌哄紑灞炴��
+ /// <summary>
+ /// A鐩稿姛鐜�
+ /// </summary>
+ public const string PowerA = "power_a";
+ /// <summary>
+ /// B鐩稿姛鐜�
+ /// </summary>
+ public const string PowerB = "power_b";
+ /// <summary>
+ /// C鐩稿姛鐜�
+ /// </summary>
+ public const string PowerC = "power_c";
+ /// <summary>
+ /// A鐩哥數鍘�
+ /// </summary>
+ public const string VoltageA = "voltage_a";
+ /// <summary>
+ /// B鐩哥數鍘�
+ /// </summary>
+ public const string VoltageB = "voltage_b";
+ /// <summary>
+ /// C鐩哥數鍘�
+ /// </summary>
+ public const string VoltageC = "voltage_c";
+ /// <summary>
+ /// A鐩哥數娴�
+ /// </summary>
+ public const string CurrentA = "current_a";
+ /// <summary>
+ /// B鐩哥數娴�
+ /// </summary>
+ public const string CurrentB = "current_b";
+ /// <summary>
+ /// C鐩哥數娴�
+ /// </summary>
+ public const string CurrentC = "current_c";
+ /// <summary>
+ /// A鐩告俯搴�
+ /// </summary>
+ public const string TempA = "temp_a";
+ /// <summary>
+ /// B鐩告俯搴�
+ /// </summary>
+ public const string TempB = "temp_b";
+ /// <summary>
+ /// C鐩告俯搴�
+ /// </summary>
+ public const string TempC = "temp_c";
+ /// <summary>
+ /// 杩囨祦鍊�
+ /// </summary>
+ public const string MaxCurrent = "max_current";
+ /// <summary>
+ /// 杩囨俯鍊�
+ /// </summary>
+ public const string MaxTemp = "max_temp";
+ /// <summary>
+ /// A鐩哥數閲�
+ /// </summary>
+ public const string ElectricityA = "electricity_a";
+ /// <summary>
+ /// B鐩哥數閲�
+ /// </summary>
+ public const string ElectricityB = "electricity_b";
+ /// <summary>
+ /// C鐩哥數閲�
+ /// </summary>
+ public const string ElectricityC = "electricity_c";
+
+ #endregion
+
+
public const string _null = "";
/// <summary>
/// 瀹夐槻甯冮槻鐘舵��
@@ -1061,6 +1366,22 @@
/// 浜害
/// </summary>
public const string Brightness = "brightness";
+ /// <summary>
+ /// 鐐僵寮�鍏�
+ /// </summary>
+ public const string Colorful = "colorful";
+ /// <summary>
+ /// 鐐僵寮�鍚鑹�
+ /// </summary>
+ public const string ColorfulBegin = "colorful_begin";
+ /// <summary>
+ /// 鐐僵缁撴潫棰滆壊
+ /// </summary>
+ public const string ColorfulEnd = "colorful_end";
+ /// <summary>
+ /// 鐐僵杩愯鏃堕棿
+ /// </summary>
+ public const string ColorfulTime = "colorful_time";
/// <summary>
/// 棰滆壊
/// </summary>
@@ -1173,7 +1494,12 @@
public const string Temperature = "temperature";
public const string Hcho = "hcho";
public const string Humidity = "humidity";
+ /// <summary>
+ /// 鐓у害
+ /// </summary>
+ public const string Illuminance = "illuminance";
public const string Pm25 = "pm25";
+ public const string Pm10 = "pm10";
public const string Tvoc = "tvoc";
/// <summary>
/// 鐘舵��,浼犳劅鍣�
@@ -1311,6 +1637,32 @@
/// </summary>
public const string TotalElectricity = "total_electricity";
+ /// <summary>
+ /// 娴蜂俊tv闊抽噺
+ /// </summary>
+ public const string SetVolume = "set_volume";
+ /// <summary>
+ /// 娴蜂俊tv淇″彿婧�(0:LiveTV;2:PS;3:HDMI_1;4:HDMI_2;5:HDMI_3;6:HDMI_4;11:AV;)
+ /// </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>
@@ -1372,11 +1724,15 @@
/// <summary>
/// 缇ゆ帶锛堣嚜瀹氫箟锛�
/// </summary>
- public const string GroupControl = "GroupControl";
+ public const string GroupControl = "groupControl";
/// <summary>
/// 閫氱敤寮�鍏�
/// </summary>
public const string OtherCommon = "other.common";
+ /// <summary>
+ /// 搴忓垪
+ /// </summary>
+ public const string CommonSeries = "other.series";
/// <summary>
/// 澶у崕鎽勫儚澶�
/// </summary>
@@ -1411,10 +1767,30 @@
list.Add(DoorLock);
return list;
}
+
+
+ /// <summary>
+ /// 鐚溂(鏃pk)
+ /// </summary>
+ public const string Peephole = "peephole";
+
+ /// <summary>
+ /// 鐚溂(鏂皊pk 鏆傛椂娌＄敤)
+ /// </summary>
+ //public const string PeepholeEz = "security.peephole.ez";
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣
/// </summary>
public const string VideoDoorLock="security.door.ezviz";
+ /// <summary>
+ /// 钀ょ煶鎽勫儚澶�
+ /// </summary>
+ public const string Ev_Ipcam = "security.ipcam.ez";
+ /// <summary>
+ /// 褰遍煶涓帶
+ /// </summary>
+ public const string AvZkAiks = "av.zk.aiks";
+
/// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
/// </summary>
@@ -1423,6 +1799,31 @@
{
var list = new List<string>();
list.Add(VideoDoorLock);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 褰遍煶涓帶spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetVideoControlsSPKList()
+ {
+ var list = new List<string>
+ {
+ AvZkAiks
+ };
+ return list;
+ }
+
+ /// <summary>
+ /// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetEvIpcamSPKList()
+ {
+ var list = new List<string>();
+ list.Add(Ev_Ipcam);
return list;
}
@@ -1617,6 +2018,8 @@
{
var spkList = new List<string>();
spkList.Add(ElectricEnergy);
+ spkList.Add(AirSwitch);
+ spkList.Add(AirSwitchP3);
return spkList;
}
#endregion
@@ -1655,6 +2058,10 @@
/// (绾㈠绉诲姩浼犳劅鍣�)
/// </summary>
public const string SensorPir = "sensor.pir";
+ /// <summary>
+ /// 浜轰綋瀛樺湪浼犳劅鍣�
+ /// </summary>
+ public const string SensorPirHold = "sensor.pir_hold";
/// <summary>
/// 锛堥棬绐椾紶鎰熷櫒锛�
/// </summary>
@@ -1710,6 +2117,7 @@
var spkList = new List<string>();
//spkList.Add(SensorLight);
spkList.Add(SensorPir);
+ spkList.Add(SensorPirHold);
spkList.Add(SensorHelp);
spkList.Add(SensorDoorWindow);
spkList.Add(SensorSmoke);
@@ -1803,6 +2211,7 @@
spkList.Add(SensorEnvironment2);
spkList.Add(SensorEnvironment3);
spkList.Add(SensorHcho);
+ spkList.Add(SensorLight);
return spkList;
}
/// <summary>
@@ -1819,6 +2228,7 @@
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
spkList.Add(SensorHcho);
+ spkList.Add(SensorLight);
return spkList;
}
@@ -1832,6 +2242,7 @@
spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
spkList.Add(SensorEnvironment2);
spkList.Add(SensorEnvironment3);
+
return spkList;
}
@@ -1839,6 +2250,10 @@
#endregion
#region 瀹剁數
+ /// <summary>
+ /// 娴蜂俊鐢佃
+ /// </summary>
+ public const string ElectricalTvHisense = "electrical.tv.hisense";
/// <summary>
/// 瀹剁數銆佹彃搴�
/// </summary>
@@ -1891,7 +2306,7 @@
/// <summary>
/// 绾㈠鐑按鍣�
/// </summary>
- public const string HeaterIr = " ir.water_heater";
+ public const string HeaterIr = "ir.water_heater";
/// <summary>
/// 绾㈠椋庢墖
/// </summary>
@@ -1900,6 +2315,10 @@
/// 鏅鸿兘绌哄紑
/// </summary>
public const string AirSwitch = "electrical.breaker";
+ /// <summary>
+ /// 涓夌浉鏅鸿兘绌哄紑
+ /// </summary>
+ public const string AirSwitchP3 = "electrical.breakerP3";
#region 娑傞甫
/// <summary>
@@ -1953,6 +2372,7 @@
spkList.Add(ElectricTuyaWaterValve);
spkList.Add(ElectricTuyaWaterValve2);
spkList.Add(AirSwitch);
+ spkList.Add(ElectricalTvHisense);
return spkList;
}
--
Gitblit v1.8.0