From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/Entity/Function/Function.cs | 102 ++++++++++++++++++++++++++-------------------------
1 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 8808a33..45f4951 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -17,6 +17,10 @@
/// </summary>
public string attri;
/// <summary>
+ /// 灞炴�у悕绉�
+ /// </summary>
+ public string name;
+ /// <summary>
/// 灞炴�х殑鍊�
/// </summary>
public List<string> value;
@@ -30,63 +34,67 @@
public int min;
/// <summary>
+ /// 鏁版嵁绫诲瀷
+ /// </summary>
+ public string data_type = "";
+
+ /// <summary>
/// 褰撳墠鍊�
/// app杞欢鑷畾涔夊睘鎬�
/// 鐢ㄦ潵璁板綍褰撳墠鐘舵��
/// </summary>
- public object curValues;
+ public object curValues = new object();
}
+ /// <summary>
+ /// 璁惧鍔熻兘oid
+ /// </summary>
+ public class FunctionOid
+ {
+ public string oid;
+ public string name;
+ public string machine_id;
+ public string net_id;
+ public string dev_id;
+ public string channels;
+ }
+
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 (propertList == null || propertList.Count == 0)
- //{
- // foreach (var t in propertList)
- // {
- // 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鍗忚鍔熻兘鐨勭壒鎬�
/// 濡傦細鏄疉C鍔熻兘锛氱壒鎬э細on_off,mode,fan,temperature
/// attri
/// </summary>
- public List<Trait> propertList = new List<Trait>();
+ public List<Trait> function = new List<Trait>();
/// <summary>
/// 鎴块棿ID鍒楄〃
@@ -101,12 +109,6 @@
public BusData bus_Data;
#endregion
-
- ///// <summary>
- ///// 鍔熻兘闄勫甫鐨勫睘鎬т笌鍊肩殑鍒楄〃
- ///// </summary>
- //public Dictionary<string, string> dicPropert;
-
/// <summary>
/// 鍔熻兘绫诲埆
/// 濡傦細绌鸿皟绫汇�佺伅鍏夌被銆佺獥甯樼被
@@ -117,7 +119,7 @@
{
try
{
- var _functionCategoryString = sid.Substring(24, 2);
+ var _functionCategoryString = sid.Substring(16, 2);
var _functionCategory = Convert.ToInt32(_functionCategoryString, 16);
return (FunctionCategory)Enum.ToObject(typeof(FunctionCategory), _functionCategory);
}
@@ -133,7 +135,7 @@
{
get
{
- var _functionTypeString = sid.Substring(24, 4);
+ var _functionTypeString = sid.Substring(16, 4);
return (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
}
}
@@ -160,6 +162,7 @@
/// <summary>
/// 鏈�鍚庢帶鍒剁殑涓�娆＄姸鎬�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string lastState = "";
[Newtonsoft.Json.JsonIgnore]
@@ -178,7 +181,7 @@
{
if (trait_on_off == null)
{
- trait_on_off = propertList.Find((obj) => obj.attri == "on_off");
+ trait_on_off = function.Find((obj) => obj.attri == "on_off");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_on_off == null)
{
@@ -197,7 +200,7 @@
catch
{
MainPage.Log("on_off 鏁版嵁鑾峰彇澶辫触.");
- propertList.Add( new Trait()
+ function.Add( new Trait()
{
attri = "on_off",
value = new List<string> { "on", "off" },
@@ -213,7 +216,7 @@
{
if (trait_on_off == null)
{
- trait_on_off = propertList.Find((obj) => obj.attri == "on_off");
+ trait_on_off = function.Find((obj) => obj.attri == "on_off");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_on_off == null)
{
@@ -232,7 +235,7 @@
catch (Exception ex)
{
MainPage.Log($"on_off 鏁版嵁鍒锋柊澶辫触: {ex.Message}");
- propertList.Add(new Trait()
+ function.Add(new Trait()
{
attri = "on_off",
value = new List<string> { "on", "off" },
@@ -309,7 +312,6 @@
}
return roomNameList;
}
-
/// <summary>
/// 鏇存柊鏃堕棿
--
Gitblit v1.8.0