From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs |   68 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
index be1ae91..f766157 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
@@ -42,8 +42,14 @@
         /// </summary>
         ColorTemperatureLight = 258,
         /// <summary>
+        /// 璋冨厜鍣ㄦ帶鍒跺櫒
+        /// <para>璁惧ID涓�260</para>
+        /// <para>瀹氫箟瀵硅薄 DimmerSwitch</para>
+        /// </summary>
+        DimmerSwitch = 260,
+        /// <summary>
         /// 棰滆壊璋冨厜鐏紑鍏�
-        /// <para>璁惧ID涓�2</para>
+        /// <para>璁惧ID涓�261</para>
         /// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para>
         /// </summary>
         ColorDimmerSwitch = 261,
@@ -61,6 +67,7 @@
         /// 璁惧ID涓�528鐨勮澶�
         /// <para>棰滆壊璋冨厜鐏細鏀寔浜害/鑹插害/楗卞拰搴�</para>
         /// <para>璋冨厜璁惧</para>
+        /// <para>瀹氫箟瀵硅薄锛欳olorDimmableLight</para>
         /// </summary>
         ColorDimmableLight = 528,
         /// <summary>
@@ -69,6 +76,18 @@
         /// <para>瀹氫箟瀵硅薄锛欰C</para>
         /// </summary>
         Thermostat = 769,
+        /// <summary>
+        /// <para>娓╂箍搴︿紶鎰熷櫒</para>
+        /// <para>璁惧ID涓�770</para>
+        /// <para>瀹氫箟瀵硅薄锛歍emperatureSensor</para>
+        /// </summary>
+        TemperatureSensor = 770,
+        /// <summary>
+        /// <para>PM2.5浼犳劅鍣�</para>
+        /// <para>璁惧ID涓�777</para>
+        /// <para>瀹氫箟瀵硅薄锛歅MSensor</para>
+        /// </summary>
+        PMSensor = 777,
         /// <summary>
         /// 瀹夐槻璁惧
         /// <para>璁惧ID涓�1026鐨勮澶�</para>
@@ -82,14 +101,6 @@
         /// </summary>
         Buzzer = 1027,
         /// <summary>
-        /// 绌烘皵寮�鍏�
-        /// </summary>
-        AirSwitch = 53249,
-        /// <summary>
-        /// 涓户鍣�
-        /// </summary>
-        Repeater = 53250,
-        /// <summary>
         /// 鎺у埗婧愯澶�
         /// <para>璁惧ID涓�0</para>
         /// <para>瀹氫箟瀵硅薄锛歅anel</para>
@@ -101,34 +112,39 @@
         /// <para>瀹氫箟瀵硅薄锛歅anel</para>
         /// </summary>
         OtaDevice = 49153,
+        /// <summary>
+        /// 绌烘皵寮�鍏�
+        /// </summary>
+        AirSwitch = 53249,
+        /// <summary>
+        /// 涓户鍣�
+        /// </summary>
+        Repeater = 53250,
+        /// 杞崲鍣�
+        /// <para>璁惧ID涓�53251</para>
+        /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
+        /// </summary>
+        Transverter = 0xD003,
+        /// <summary>
+        /// <para>鏅捐。鏋�</para>
+        /// <para>璁惧ID涓�0xD004 </para>
+        /// <para>瀹氫箟瀵硅薄锛欰irer</para>
+        /// </summary>
+        Airer = 0xD004,
+
         /// 鏂伴
         /// <para>璁惧ID涓�53504</para>
         /// <para>瀹氫箟瀵硅薄锛欶reshAirAC</para>
         /// </summary>
         FreshAir = 0xD100,
+
         /// <summary>
         /// <para>鏂伴婀垮害浼犳劅鍣�</para>
         /// <para>璁惧ID涓�53760</para>
         /// <para>瀹氫箟瀵硅薄锛欻umiditySensor</para>
         /// </summary>
         FreshAirHumiditySensor = 0xD200,
-        /// 杞崲鍣�
-        /// <para>璁惧ID涓�53251</para>
-        /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
-        /// </summary>
-        Transverter = 0xD003,
-        /// <summary>
-        /// <para>娓╂箍搴︿紶鎰熷櫒</para>
-        /// <para>璁惧ID涓�770</para>
-        /// <para>瀹氫箟瀵硅薄锛歍emperatureSensor</para>
-        /// </summary>
-        TemperatureSensor = 770,
-        /// <summary>
-        /// <para>PM2.5浼犳劅鍣�</para>
-        /// <para>璁惧ID涓�777</para>
-        /// <para>瀹氫箟瀵硅薄锛歅MSensor</para>
-        /// </summary>
-        PMSensor = 777,
+
     }
 
     /// <summary>

--
Gitblit v1.8.0