From 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 09:31:44 +0800
Subject: [PATCH] 合并代码，更改面板目标信息
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
old mode 100755
new mode 100644
index 79b5835..13f1e4e
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs
@@ -10,6 +10,10 @@
/// </summary>
Basic = 0,
/// <summary>
+ /// 鏌ヨ鐢甸噺
+ /// </summary>
+ Power = 1,
+ /// <summary>
/// 璁惧璇嗗埆鍔熻兘
/// </summary>
Identify = 3,
@@ -45,6 +49,10 @@
///婀垮害娴嬮噺鍔熻兘
/// </summary>
RelativeHumidityMeasurement = 1029,
+ /// <summary>
+ ///PM2.5娴嬮噺鍔熻兘
+ /// </summary>
+ PmTwoPointFiveMeasurement = 1066,
/// <summary>
/// 鎭掓俯鍣ㄥ姛鑳�
/// </summary>
@@ -160,7 +168,7 @@
///鐏叿绉嶇被
/// </summary>
ColorCapabilities = 16394,
-
+
#region 绐楀笜
/// <summary>
///绐楀笜璁惧绫诲瀷
@@ -267,7 +275,11 @@
/// <summary>
/// 杩囪檻缃戞竻娲楁爣蹇�:42
/// </summary>
- CleanStatu = 4097,
+ CleanStatu = 4097,
+ /// <summary>
+ /// 鍚敤绌鸿皟鎽嗛妯″紡鐨勭姸鎬�(鎵撳紑 鎴栬�� 鍏抽棴)
+ /// </summary>
+ UseAcSwingFunctionStatu = 4097,
#endregion
@@ -299,6 +311,11 @@
/// 纭欢鐗堟湰
/// </summary>
mgHWversion = 65024,
+
+ /// <summary>
+ /// 闂ㄩ攣鐢甸噺
+ /// </summary>
+ DoorLockPower = 33,
}
/// <summary>
@@ -309,12 +326,12 @@
AddLogic = 2000,
ReviseAttribute = 2001,
GetLogicInfo = 2002,
- GetLogicList= 2004,
+ GetLogicList = 2004,
LogicChangeCondition = 2005,
LogicSetConditionData = 2006,
LogicChangeAction = 2007,
LogicDelAction = 2008,
- DelLogic= 2009,
+ DelLogic = 2009,
/// <summary>
/// 鎺ㄨ繜瀹氭椂
/// </summary>
@@ -332,5 +349,5 @@
SceneGetNewId = 800,
SceneAddMember = 810,
}
-
+
}
--
Gitblit v1.8.0