From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1

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

diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
index 72c1121..d273095 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
@@ -5,24 +5,12 @@
     {
         UnKown = 0x9999,
         ZbGateway = 0x9998,
-        Scene = 0x9997,
-        Logic = 0x9996,
-        Group = 0x9995,
-        Security = 0x9994,
-
         /// <summary>
         /// 骞茬粨鐐�
         /// <para>璁惧ID涓�0</para>
         /// <para>瀹氫箟瀵硅薄锛歅anel</para>
         /// </summary>
         OnOffSwitch = 0,
-        /// <summary>
-        /// 杞崲鍣�
-        /// <para>璁惧ID涓�53251</para>
-        /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
-        /// </summary>
-        Transverter = 0xD003,
-
         /// <summary>
         /// 缁х數鍣�
         /// <para>璁惧ID涓�2</para>
@@ -36,25 +24,28 @@
         /// </summary>
         DoorLock = 10,
         /// <summary>
+        /// 璁惧ID涓�257鐨勮澶�
+        /// <para>璋冨厜鐏細鏀寔浜害</para>
+        /// <para>璋冨厜璁惧</para>
+        /// </summary>
+        DimmableLight = 257,
+        /// <summary>
         /// 绐楀笜璁惧ID
         /// <para>Rollershade:鍗峰笜</para>
         /// </summary>
         WindowCoveringDevice = 514,
-
         /// <summary>
         /// 璁惧ID涓�528鐨勮澶�
         /// <para>棰滆壊璋冨厜鐏細鏀寔浜害/鑹插害/楗卞拰搴�</para>
         /// <para>璋冨厜璁惧</para>
         /// </summary>
         ColorDimmableLight = 528,
-
         /// <summary>
-        /// 璁惧ID涓�257鐨勮澶�
-        /// <para>璋冨厜鐏細鏀寔浜害</para>
-        /// <para>璋冨厜璁惧</para>
+        /// 鎭掓俯鍣�
+        /// <para>璁惧ID涓�769</para>
+        /// <para>瀹氫箟瀵硅薄锛欰C</para>
         /// </summary>
-        DimmableLight = 257,
-
+        Thermostat = 769,
         /// <summary>
         /// 瀹夐槻璁惧
         /// <para>璁惧ID涓�1026鐨勮澶�</para>
@@ -70,33 +61,6 @@
         /// </summary>
         Repeater = 53250,
         /// <summary>
-        /// 鎭掓俯鍣�
-        /// <para>璁惧ID涓�769</para>
-        /// <para>瀹氫箟瀵硅薄锛欰C</para>
-        /// </summary>
-        Thermostat = 769,
-
-        // ExtendedColorLight = 528,
-
-        //LevelControlSwitch = 1,
-        //OnOffLight = 256,
-        //DimmableLight = 257,
-
-        //OnOffLightSwitch = 259,
-        //DimmerSwitch = 260,
-        //ColorDimmerSwitch = 261,
-        //LightSensor = 262,
-        //OccupancySensor = 263,
-        //TemperatureSensor = 770,
-
-        /// <summary>
-        /// Curtain
-        /// </summary>
-        //ShadeCurtain = 0x0200,
-        //ShadeController = 0x0201,
-        //WindowCoveringController = 0x0203,
-
-        /// <summary>
         /// 鎺у埗婧愯澶�
         /// <para>璁惧ID涓�0</para>
         /// <para>瀹氫箟瀵硅薄锛歅anel</para>
@@ -107,7 +71,18 @@
         /// <para>璁惧ID涓�0</para>
         /// <para>瀹氫箟瀵硅薄锛歅anel</para>
         /// </summary>
-        OtaDevice = 49153,
+        OtaDevice = 49153,
+        /// 杞崲鍣�
+        /// <para>璁惧ID涓�53251</para>
+        /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
+        /// </summary>
+        Transverter = 0xD003,
+        /// <summary>
+        /// <para>娓╂箍搴︿紶鎰熷櫒</para>
+        /// <para>璁惧ID涓�770</para>
+        /// <para>瀹氫箟瀵硅薄锛歍emperatureSensor</para>
+        /// </summary>
+        TemperatureSensor = 770,
     }
 
     /// <summary>
@@ -116,6 +91,10 @@
     public enum DeviceFunctionType
     {
         /// <summary>
+        /// 娌℃湁鎸囧畾涓轰粈涔堢被鍨�
+        /// </summary>
+        A鏈畾涔� = 0,
+        /// <summary>
         /// 寮�鍏�
         /// </summary>
         A寮�鍏� = 1,

--
Gitblit v1.8.0