From 685ae611a1fde0dd1d28ff0e350674c4de239213 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 09 三月 2021 15:11:16 +0800
Subject: [PATCH] 变更空气净化器的滤芯复位控件
---
HDL_ON/Entity/Function/Function.cs | 88 +++++++++++++++++++-------------------------
1 files changed, 38 insertions(+), 50 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 1737170..2eca3c6 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -89,18 +89,18 @@
}
/// <summary>
- /// 鑾峰彇灞炴�х姸鎬�
+ /// 鑾峰彇灞炴�у綋鍓嶇姸鎬�
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
public string GetAttrState(string key)
{
- var attrState = status.Find((s) => s.key == key.ToString());
+ var attrState = attributes.Find((s) => s.key == key.ToString());
if(attrState == null)
{
- return "";
+ return "0";
}
- return attrState.value;
+ return attrState.state;
}
/// <summary>
/// 璁剧疆灞炴�х姸鎬�
@@ -110,44 +110,25 @@
/// <returns>淇敼缁撴灉</returns>
public bool SetAttrState(string key, string value)
{
- var attrState = status.Find((s) => s.key == key.ToString());
- if (attrState == null)
+ //var attrState = status.Find((s) => s.key == key.ToString());
+ var attr = attributes.Find((s) => s.key == key);
+ if (attr == null)
{
return false;
}
else
{
- attrState.value = value;
+ attr.state = value;
}
return true;
}
+
+
#endregion
#region base info
- /// <summary>
- /// 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> 鈥�0001021599F98A04050300010000鈥�
public string sid = "0301011234567801012301230123";
/// <summary>
/// 澶囨敞
@@ -187,23 +168,6 @@
/// attri
/// </summary>
public List<FunctionAttributes> attributes = new List<FunctionAttributes>();
- /// <summary>
- /// 鍔熻兘鐘舵�佸垪琛�
- /// </summary>
- public List<AttributesStatus> status = new List<AttributesStatus>();
- /// <summary>
- /// 鑾峰彇鐘舵�佸��
- /// </summary>
- /// <returns></returns>
- public string GetStatusValus(string key)
- {
- var d = status.Find((obj) => obj.key == key);
- if(d==null)
- {
- return null;
- }
- return d.value;
- }
/// <summary>
/// 鎴块棿ID鍒楄〃
@@ -531,7 +495,7 @@
sendDataObj.time_stamp = Control.Ins.Get_TimeStamp();
- var acd = new AlinkControlData();
+ var acd = new AlinkStatusData();
acd.sid = sid;
foreach (var dic in commandDictionary)
{
@@ -593,7 +557,7 @@
/// </summary>
public class AlinkFunctionStatusObj
{
- public List<AlinkControlData> objects = new List<AlinkControlData>();
+ public List<AlinkStatusData> objects = new List<AlinkStatusData>();
public string time_stamp = "";
public string id = "";
@@ -609,11 +573,23 @@
public string time_stamp = "";
}
/// <summary>
- /// A鍗忚鎺у埗鏁版嵁
+ /// A鍗忚鐘舵�佹暟鎹�
/// </summary>
- public class AlinkControlData
+ public class AlinkStatusData
{
+ /*
+ mqtt鎺ユ敹鐨勭姸鎬佹暟鎹病鏈塪eviceId
+ 鎺ュ彛鍙嶉鐨勬暟鎹湁
+ */
+ /// <summary>
+ ///
+ /// </summary>
public string sid = "";
+ /// <summary>
+ /// 璁惧ID
+ /// 浜戠璐熻矗鐢熸垚
+ /// </summary>
+ public string deviceId = "0";
public List<AttributesStatus> status = new List<AttributesStatus>();
}
/// <summary>
@@ -660,6 +636,10 @@
/// 鏁版嵁绫诲瀷
/// </summary>
public string data_type = "";
+ /// <summary>
+ /// 褰撳墠鐘舵��
+ /// </summary>
+ public string state = "";
/// <summary>
/// 褰撳墠鍊�
/// </summary>
@@ -990,6 +970,14 @@
/// 鍑夐湼
/// </summary>
public const string ClothesHanger = "electrical.racks";
+ /// <summary>
+ /// 绾㈠瀹�
+ /// </summary>
+ public const string IrModule = "ir.module";
+ /// <summary>
+ /// 绾㈠绌鸿皟
+ /// </summary>
+ public const string IrAC = "ir.ac";
/// <summary>
--
Gitblit v1.8.0