From 320d7cc8feb394d0ce3db2ec1d01593b554d990f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 10:57:13 +0800
Subject: [PATCH] 2020-12-23 1.更新
---
HDL_ON/Entity/Function/Function.cs | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index e33e5c6..8e666a9 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -162,7 +162,7 @@
{
if (_trait_on_off == null)
{
- _trait_on_off = attributes.Find((obj) => obj.key == "on_off");
+ _trait_on_off = attributes.Find((obj) => obj.key == FunctionAttributeKey.OnOff);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_on_off == null)
{
@@ -173,8 +173,12 @@
max = 1,
min = 0,
};
+ _trait_on_off.curValue = "off";
}
- _trait_on_off.curValue = "on";
+ }
+ if(_trait_on_off.curValue.ToString() != "on"&& _trait_on_off.curValue.ToString() != "off")
+ {
+ _trait_on_off.curValue = "off";
}
return _trait_on_off;
}
@@ -187,7 +191,7 @@
/// <summary>
/// 浣跨敤娆℃暟
/// </summary>
- public double usageCount = 0;
+ public double controlCounter = 0;
/// <summary>
/// 浣跨敤棰戠巼
/// </summary>
@@ -195,7 +199,7 @@
{
get
{
- return usageCount / 7;
+ return controlCounter / 7;
}
}
/// <summary>
@@ -208,7 +212,7 @@
string busId = "";
if (bus != null)
{
- busId = bus.SubnetID + "_" + bus.DeviceID + "_" + bus.loopId;
+ busId = bus.SubnetID + "_" + bus.DeviceID + "_" + bus.LoopId;
}
return busId;
}
@@ -231,11 +235,11 @@
{
roomNameList += ",";
}
- roomNameList += findRoom.floorName + findRoom.roomName;
+ roomNameList += findRoom.floorName +"-"+ findRoom.roomName;
}
if (roomNameList == "" && functionType == FunctionType.Scene)
{
- roomNameList = Language.StringByID(StringId.WholeHouseScene);
+ roomNameList = Language.StringByID(StringId.WholeZone);
}
return roomNameList;
}
@@ -286,17 +290,40 @@
var sFunc = new SceneFunction();
foreach (var attr in attributes)
{
- if (attr.key == FunctionAttributeKey.SetTemp)
+ switch (attr.key)
{
- var vv = Convert.ToDouble(attr.value);
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
+ case FunctionAttributeKey.OnOff:
+ case FunctionAttributeKey.Brightness:
+ case FunctionAttributeKey.Mode:
+ case FunctionAttributeKey.SetTemp:
+ case FunctionAttributeKey.FanSpeed:
+ case FunctionAttributeKey.Percent:
+ //case FunctionAttributeKey.FadeTime:
+ if (attr.curValue.ToString() == "{}")
+ {
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ attr.curValue = "off";
+ }
+ else
+ {
+ attr.curValue = "0";
+ }
+ }
+ if (attr.key == FunctionAttributeKey.SetTemp)
+ {
+ double vv = 16;
+ Double.TryParse(attr.curValue.ToString(), out vv);
+ sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
+ }
+ else
+ {
+ sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+ }
+ break;
}
- else
- {
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
- }
- sFunc.sid = this.sid;
}
+ sFunc.sid = this.sid;
return sFunc;
}
@@ -317,9 +344,9 @@
var acd = new AlinkControlData();
acd.sid = sid;
- var aca = new AlinkControlAttributes();
foreach (var dic in commandDictionary)
{
+ var aca = new AlinkControlAttributes();
aca.key = dic.Key;
aca.value = dic.Value;
acd.status.Add(aca);
@@ -338,6 +365,7 @@
ApiAlinkControlActionObj aaao = new ApiAlinkControlActionObj();
aaao.deviceId = this.deviceId;
aaao.spk = this.spk;
+ aaao.bus = this.bus;
foreach (var kv in keyValues)
{
aaao.attributes.Add(new AlinkControlAttributes()
@@ -420,6 +448,7 @@
/// 鍔熻兘灞炴��
/// 灞炴�у瓧娈佃В鏋愶細attri :灞炴�у唴瀹癸紝value 灞炴�х殑鍊硷紝max 鏈�澶у�� min 鏈�灏忓��
/// </summary>
+ [System.Serializable]
public class FunctionAttributes
{
/// <summary>
@@ -464,7 +493,11 @@
/// <summary>
/// 棰滆壊
/// </summary>
- public const string Color = "color";
+ public const string RGB = "rgb";
+ /// <summary>
+ /// 娓愬彉鏃堕棿
+ /// </summary>
+ public const string FadeTime = "fade_time";
/// <summary>
/// 妯″紡
/// </summary>
@@ -493,6 +526,10 @@
/// 瀹ゅ唴娓╁害
/// </summary>
public const string IndoorTemp = "room_temp";
+ /// <summary>
+ /// value
+ /// </summary>
+ public const string Value = "value";
}
/// <summary>
/// 璁惧鍔熻兘oid
@@ -529,7 +566,15 @@
return Convert.ToByte(addresses.Substring(2, 2), 16);
}
}
- public byte loopId;
+ public byte LoopId
+ {
+ get
+ {
+ return Convert.ToByte(loopId, 16);
+ }
+ }
+
+ public string loopId;
}
public static class SPK
@@ -625,15 +670,15 @@
/// <summary>
/// 瀹剁數銆佹彃搴�
/// </summary>
- public const string ElectricSocket = "electric.socket ";
+ public const string ElectricSocket = "electrical.socket";
/// <summary>
/// 瀹剁數銆佺數瑙�
/// </summary>
- public const string ElectricTV = "electric.tv";
+ public const string ElectricTV = "electrical.tv";
/// <summary>
/// 瀹剁數銆侀鎵�
/// </summary>
- public const string ElectricFan = "electric.fan";
+ public const string ElectricFan = "electrical.fan";
}
}
\ No newline at end of file
--
Gitblit v1.8.0