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 |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 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 0ff39e6..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,
@@ -46,6 +50,10 @@
         /// </summary>
         RelativeHumidityMeasurement = 1029,
         /// <summary>
+        ///PM2.5娴嬮噺鍔熻兘
+        /// </summary>
+        PmTwoPointFiveMeasurement = 1066,
+        /// <summary>
         /// 鎭掓俯鍣ㄥ姛鑳�
         /// </summary>
         Thermostat = 513,
@@ -53,6 +61,10 @@
         /// 鎭掓俯鍣ㄥ姛鑳斤紙椋庢墖锛�
         /// </summary>
         FanControl = 514,
+        /// <summary>
+        /// 鎭掓俯鍣ㄥ姛鑳斤紙椋庢墖鎵锛�
+        /// </summary>
+        FanSwing = 514,
         /// <summary>
         /// 闂ㄩ攣鍔熻兘
         /// </summary>
@@ -156,7 +168,7 @@
         ///鐏叿绉嶇被
         /// </summary>
         ColorCapabilities = 16394,
-       
+
         #region 绐楀笜
         /// <summary>
         ///绐楀笜璁惧绫诲瀷
@@ -248,6 +260,27 @@
         /// </summary>
         FanModeSequence = 1,
 
+        /// <summary>
+        /// 杩囪檻缃戞竻娲楁爣蹇�,濡傛灉杩斿洖鍗佽繘鍒躲��42銆戝垯浠h〃闇�瑕佹竻娲楁护缃�
+        /// </summary>
+        FilterCleaningStatus = 4097,
+        /// <summary>
+        /// 绌鸿皟鑷畾涔夎缃殑鏀寔妯″紡
+        /// </summary>
+        AcModeSupport = 4099,
+        /// <summary>
+        /// 绌鸿皟鎽嗛
+        /// </summary>
+        FanSwing = 4096,
+        /// <summary>
+        /// 杩囪檻缃戞竻娲楁爣蹇�:42
+        /// </summary>
+        CleanStatu = 4097,
+        /// <summary>
+        /// 鍚敤绌鸿皟鎽嗛妯″紡鐨勭姸鎬�(鎵撳紑 鎴栬�� 鍏抽棴)
+        /// </summary>
+        UseAcSwingFunctionStatu = 4097,
+
         #endregion
 
         #region 绉佹湁鎸夐敭灞炴��
@@ -278,6 +311,11 @@
         /// 纭欢鐗堟湰
         /// </summary>
         mgHWversion = 65024,
+
+        /// <summary>
+        /// 闂ㄩ攣鐢甸噺
+        /// </summary>
+        DoorLockPower = 33,
     }
 
     /// <summary>
@@ -288,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>
@@ -311,5 +349,5 @@
         SceneGetNewId = 800,
         SceneAddMember = 810,
     }
- 
+
 }

--
Gitblit v1.8.0