From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/Entity/Function/Function.cs | 207 ++++++++++++++++++++++++++++++---------------------
1 files changed, 120 insertions(+), 87 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index b7a8a44..8f996e3 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -19,7 +19,7 @@
/// <summary>
/// 灞炴�х殑鍊�
/// </summary>
- public string value;
+ public List<string> value;
/// <summary>
/// 鏈�澶у��
/// </summary>
@@ -28,58 +28,56 @@
/// 鏈�灏忓��
/// </summary>
public int min;
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string data_type = "";
+
+ /// <summary>
+ /// 褰撳墠鍊�
+ /// app杞欢鑷畾涔夊睘鎬�
+ /// 鐢ㄦ潵璁板綍褰撳墠鐘舵��
+ /// </summary>
+ public object curValues;
}
public class Function
{
- /*
- HDL缁熶竴鍗忚鏍煎紡锛�16bytes
- 鍘傚晢浠ｅ彿锛�2bytes
- 閫氳鏂瑰紡锛氭湁绾�/鏃犵嚎/ZIGBEE绛�1bytes
- 浜у搧璇嗗埆鐮侊細浠ユ坊鍔犺澶囩殑骞存湀鏃ユ椂鍒嗙 + 闅忔満鏁� 8bytes Category
- 鍔熻兘绫诲埆锛�1bytes
- 鏁版嵁琛ㄧ储寮曞湴鍧�锛�2bytes
- 鍥炶矾锛�2bytes
- 涓句緥锛� 0001-00-2019101209001234-01-0001-0001
- */
public Function()
{
- dicPropert = new Dictionary<string, string>();
- if (trait == null || trait.Count == 0)
- {
- foreach (var t in trait)
- {
- dicPropert.TryAdd(t.attri,t.min.ToString());
- }
- }
}
#region base info
/// <summary>
- /// 鍔熻兘ID
- /// 鍘傚晢浠ｇ爜 2bytes; 01 HDL
- /// 閫氳鏂瑰紡 1byte ; 01 HDL Bus; 02 Zigbee;03 KNX;04 Z-Wave
- /// 浜у搧GUID 8bytes
- /// 浜у搧绫诲埆 1byte ; 01 璋冨厜鍣�;02缁х數鍣�;03骞叉帴鐐规ā鍧�;04浼犳劅鍣�;05闈㈡澘
- /// 鐗╂ā鍨嬬被鍨�2bytes 01 寮�鍏崇被 --01寮�鍏�;02鎻掑骇
- /// 02 鐓ф槑 --01寮�鍏崇被;02璋冨厜绫�;03鑹叉俯;04LED
- /// 03 閬槼 --01绐楀笜鐢垫満;02鐧惧彾绐�;03寮�鍚堝笜;04鍗峰笜
- /// 04 鎭掓俯鍣� --01绌鸿皟;02鍦版殩;03姣涚粏绌鸿皟
- /// 05 鏂伴
- /// 06 褰遍煶
- /// 07 闊充箰
- /// 08 鑳芥簮
- /// 09 瀹夐槻
- /// 閫氶亾鍙� 2bytes
- /// Key_id 2bytes
+ /// HDL缁熶竴鍗忚鏍煎紡锛�14bytes
+ /// 涓句緥锛� 鏉ユ簮 鍘傚晢浠ｇ爜 閫氳鏂瑰紡 浜у搧鏃堕棿鎴� 浜у搧绫诲埆 鐗╂ā鍨嬬被 閫氶亾鍙� 澶у皬绫诲埆
+ // 1byte 1byte 1byte 4byte 1byte 2byte 2byte 2byte
+ /// 鏉ユ簮锛�00 榛樿鍘熺敓鎬佺郴缁熸暟鎹� 銆�01 缃戝叧鎴栬�呭叾浠朅璁惧銆�02 璋冭瘯杞欢銆�03 APP搴旂敤绋嬪簭銆�04 绗笁鏂圭綉鍏虫垨鑰呭钩鍙�
+ /// 鍘傚晢浠ｇ爜锛�01 HDL
+ /// 閫氳鏂瑰紡锛�01 HDL Bus銆�02 Zigbee銆�03 KNX銆�04 Z-Wave
+ /// 浜у搧鏃堕棿鎴筹細4bytes 浠�2020骞�1鏈�1鏃ョ畻鍑虹殑鏃堕棿鎴�0.1s涓哄崟浣�
+ /// 浜у搧绫诲埆锛�01 璋冨厜鍣ㄣ��02 缁х數鍣ㄣ��03 骞叉帴鐐规ā鍧椼��04 浼犳劅鍣ㄣ��05 闈㈡澘
+ /// 鐗╂ā鍨嬬被鍨嬶細
+ /// 01 寮�鍏崇被锛�01 寮�鍏炽��02 鎻掑骇銆�03
+ /// 02 鐓ф槑锛� 01 寮�鍏炽��02 璋冨厜銆�03 鑹叉俯銆�04 LED
+ /// 03 閬槼锛� 01 绐楀笜鐢垫満銆�02 鐧惧彾绐椼��03 寮�鍚堝笜銆�04 鍗峰笜
+ /// 04 鎭掓俯鍣細01 绌鸿皟銆�02 鍦版殩銆�03 姣涚粏绌鸿皟
+ /// 05 鏂伴
+ /// 06 褰遍煶
+ /// 07 闊充箰
+ /// 08 鑳芥簮
+ /// 09 瀹夐槻
+ /// 澶х被鍒� 1bytes 锛堥鐣欙級
+ /// 灏忕被鍒� 1byte 锛堥鐣欙級
/// </summary>
- public string sid = "00010112345678901234560101230123AABB";
+ public string sid = "03010112345678010123012301230101";
/// <summary>
- /// A鍗忚鍔熻兘鐨勯�氳
+ /// A鍗忚鍔熻兘鐨勭壒鎬�
/// 濡傦細鏄疉C鍔熻兘锛氱壒鎬э細on_off,mode,fan,temperature
/// attri
/// </summary>
- public List<Trait> trait = new List<Trait>();
+ public List<Trait> function = new List<Trait>();
/// <summary>
/// 鎴块棿ID鍒楄〃
@@ -95,10 +93,10 @@
#endregion
- /// <summary>
- /// 鍔熻兘闄勫甫鐨勫睘鎬т笌鍊肩殑鍒楄〃
- /// </summary>
- public Dictionary<string, string> dicPropert;
+ ///// <summary>
+ ///// 鍔熻兘闄勫甫鐨勫睘鎬т笌鍊肩殑鍒楄〃
+ ///// </summary>
+ //public Dictionary<string, string> dicPropert;
/// <summary>
/// 鍔熻兘绫诲埆
@@ -108,8 +106,17 @@
{
get
{
- var _functionCategoryString = sid.Substring(22, 2);
- return (FunctionCategory)Enum.ToObject(typeof(FunctionCategory), Convert.ToInt32(_functionCategoryString));
+ try
+ {
+ var _functionCategoryString = sid.Substring(16, 2);
+ var _functionCategory = Convert.ToInt32(_functionCategoryString, 16);
+ return (FunctionCategory)Enum.ToObject(typeof(FunctionCategory), _functionCategory);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"get FunctionCategory error : {ex.Message}");
+ return FunctionCategory.UnKown;
+ }
}
}
@@ -117,7 +124,7 @@
{
get
{
- var _functionTypeString = sid.Substring(24, 4);
+ var _functionTypeString = sid.Substring(16, 4);
return (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
}
}
@@ -135,7 +142,7 @@
{
string vendorCode = "HDL";
var code = sid.Substring(0, 4);
- if (code == "00001")
+ if (code == "0001")
vendorCode = "HDL";
return vendorCode;
}
@@ -146,7 +153,8 @@
/// </summary>
public string lastState = "";
-
+ [Newtonsoft.Json.JsonIgnore]
+ public Trait trait_on_off;
/// <summary>
/// 寮�鍏崇姸鎬�
/// 0:鍏�
@@ -159,14 +167,34 @@
{
try
{
- string o = "off";
- dicPropert.TryGetValue("on_off", out o);
- return o == "" ? "off" : o;
+ if (trait_on_off == null)
+ {
+ trait_on_off = function.Find((obj) => obj.attri == "on_off");
+ //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
+ if (trait_on_off == null)
+ {
+ trait_on_off = new Trait()
+ {
+ attri = "on_off",
+ value = new List<string> { "on", "off" },
+ max = 1,
+ min = 0,
+ };
+ }
+ trait_on_off.curValues = trait_on_off.value[trait_on_off.min];
+ }
+ return trait_on_off.curValues.ToString();
}
catch
{
MainPage.Log("on_off 鏁版嵁鑾峰彇澶辫触.");
- dicPropert.TryAdd("on_off", "0");
+ function.Add( new Trait()
+ {
+ attri = "on_off",
+ value = new List<string> { "on", "off" },
+ max = 1,
+ min = 0,
+ });
return "off";
}
}
@@ -174,12 +202,34 @@
{
try
{
- dicPropert["on_off"] = value.ToString();
+ if (trait_on_off == null)
+ {
+ trait_on_off = function.Find((obj) => obj.attri == "on_off");
+ //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
+ if (trait_on_off == null)
+ {
+ trait_on_off = new Trait()
+ {
+ attri = "on_off",
+ value = new List<string> { "on", "off" },
+ max = 1,
+ min = 0,
+ };
+ }
+ trait_on_off.curValues = trait_on_off.min;
+ }
+ trait_on_off.curValues = value;
}
- catch
+ catch (Exception ex)
{
- MainPage.Log("on_off 鏁版嵁鍒锋柊澶辫触.");
- dicPropert.TryAdd("on_off", value.ToString());
+ MainPage.Log($"on_off 鏁版嵁鍒锋柊澶辫触: {ex.Message}");
+ function.Add(new Trait()
+ {
+ attri = "on_off",
+ value = new List<string> { "on", "off" },
+ max = 1,
+ min = 0,
+ });
}
}
}
@@ -196,49 +246,25 @@
/// <summary>
/// 浣跨敤棰戠巼
/// </summary>
- public double usageFrequency = 0;
+ public double usageFrequency {
+ get
+ {
+ return usageCount / 7;
+ }
+ }
/// <summary>
/// 鍥哄畾鐨勫簭鍙�
/// </summary>
public int fixedSerialNumber = int.MaxValue;
/// <summary>
- /// A鍗忚鏁版嵁
- /// </summary>
- public List<string> PropertyArray
- {
- get
- {
- try
- {
- if (trait == null)
- return new List<string>();
- var proArr = trait.Split(',').ToList();
- foreach (var pro in proArr)
- {
- if (!dicPropert.ContainsKey(pro))
- {
- dicPropert.TryAdd(pro, "0");
- }
- }
- return proArr;
- }
- catch (Exception ex)
- {
- MainPage.Log($"Get PropertyArray error : {ex.Message}");
- return new List<string>();
- }
- }
- }
-
- /// <summary>
/// 鑾峰彇A鍗忚鎺у埗瀛楃涓�
/// </summary>
/// <param name="command">鎺у埗鍛戒护锛歸rite锛宺ead</param>
/// <returns></returns>
- public virtual JObject GetSendJObject(string command)
+ public virtual JObject GetSendJObject(CommandType_A command)
{
- var sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command }, { "Type", "device" }, };
+ var sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" }, };
var data = new JObject { { "sid", sid } };
sendJob.Add("objects", data);
return sendJob;
@@ -264,6 +290,8 @@
foreach(var roomId in roomIdList)
{
var findRoom = DB_ResidenceData.residenceData.rooms.Find(obj => obj.sid == roomId);
+ if (findRoom == null)
+ continue;
if(roomNameList != "")
{
roomNameList += ",";
@@ -272,5 +300,10 @@
}
return roomNameList;
}
+
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ public DateTime refreshTime = DateTime.MinValue;
}
}
--
Gitblit v1.8.0