From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 17 十二月 2020 09:07:13 +0800 Subject: [PATCH] 新云端Ver1.3 --- ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs | 180 ++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 126 insertions(+), 54 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs index 8b34259..dc115d2 100755 --- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs +++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs @@ -5,11 +5,6 @@ { UnKown = 0x9999, ZbGateway = 0x9998, - Scene = 0x9997, - Logic = 0x9996, - Group = 0x9995, - Security = 0x9994, - /// <summary> /// 骞茬粨鐐� /// <para>璁惧ID涓�0</para> @@ -17,45 +12,82 @@ /// </summary> OnOffSwitch = 0, /// <summary> - /// 杞崲鍣� - /// <para>璁惧ID涓�53251</para> - /// <para>瀹氫箟瀵硅薄锛歍ransverter</para> + /// 浜害鎺у埗寮�鍏� + /// <para>璁惧ID涓�2</para> + /// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para> /// </summary> - Transverter = 0xD003, - + LevelControlSwitch = 1, /// <summary> /// 缁х數鍣� /// <para>璁惧ID涓�2</para> /// <para>瀹氫箟瀵硅薄锛歍oggleLight</para> /// </summary> - OnOffOutput = 2, - + OnOffOutput = 2, /// <summary> - /// 绐楀笜璁惧ID - /// <para>Rollershade:鍗峰笜</para> + /// 闂ㄩ攣 + /// <para>璁惧ID涓�10</para> + /// <para>瀹氫箟瀵硅薄锛欴oorLock</para> /// </summary> - WindowCoveringDevice = 514, - - /// <summary> - /// 璁惧ID涓�528鐨勮澶� - /// <para>棰滆壊璋冨厜鐏細鏀寔浜害/鑹插害/楗卞拰搴�</para> - /// <para>璋冨厜璁惧</para> - /// </summary> - ColorDimmableLight = 528, - + DoorLock = 10, /// <summary> /// 璁惧ID涓�257鐨勮澶� /// <para>璋冨厜鐏細鏀寔浜害</para> /// <para>璋冨厜璁惧</para> /// </summary> - DimmableLight = 257, - + DimmableLight = 257, + /// <summary> + /// 璁惧ID涓�258鐨勮澶� + /// <para>鑹叉俯鐏�</para> + /// <para>瀹氫箟瀵硅薄锛欳olorTemperatureLight</para> + /// </summary> + ColorTemperatureLight = 258, + /// <summary> + /// 棰滆壊璋冨厜鐏紑鍏� + /// <para>璁惧ID涓�261</para> + /// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para> + /// </summary> + ColorDimmerSwitch = 261, + /// <summary> + /// 璋冨厜鍣ㄦ帶鍒跺櫒 + /// <para>璁惧ID涓�260</para> + /// <para>瀹氫箟瀵硅薄 DimmerSwitch</para> + /// </summary> + DimmerSwitch = 260, + /// <summary> + /// 绐楀笜璁惧ID + /// <para>Rollershade:鍗峰笜</para> + /// </summary> + WindowCoveringDevice = 514, + /// <summary> + /// 绐楀笜鎺у埗鍣ㄨ澶嘔D + /// <para>CurtainController:绐楀笜鎺у埗鍣�</para> + /// </summary> + WindowCoveringController = 515, + /// <summary> + /// 璁惧ID涓�528鐨勮澶� + /// <para>棰滆壊璋冨厜鐏細鏀寔浜害/鑹插害/楗卞拰搴�</para> + /// <para>璋冨厜璁惧</para> + /// <para>瀹氫箟瀵硅薄锛欳olorDimmableLight</para> + /// </summary> + ColorDimmableLight = 528, + /// <summary> + /// 鎭掓俯鍣� + /// <para>璁惧ID涓�769</para> + /// <para>瀹氫箟瀵硅薄锛欰C</para> + /// </summary> + Thermostat = 769, /// <summary> /// 瀹夐槻璁惧 /// <para>璁惧ID涓�1026鐨勮澶�</para> /// <para>瀹氫箟瀵硅薄锛欼ASZone</para> /// </summary> - IASZone = 1026, + IASZone = 1026, + /// <summary> + /// 铚傞福鍣� + /// <para>璁惧ID涓�1027鐨勮澶�</para> + /// <para>瀹氫箟瀵硅薄锛欱uzzer</para> + /// </summary> + Buzzer = 1027, /// <summary> /// 绌烘皵寮�鍏� /// </summary> @@ -64,33 +96,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> @@ -102,6 +107,73 @@ /// <para>璁惧ID涓�0</para> /// <para>瀹氫箟瀵硅薄锛歅anel</para> /// </summary> - OtaDevice = 49153, + OtaDevice = 49153, + /// 鏂伴 + /// <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> + /// <para>鏅捐。鏋�</para> + /// <para>璁惧ID涓�0xD004</para> + /// <para>瀹氫箟瀵硅薄锛欰irer</para> + /// </summary> + Airer = 53252, + /// <summary> + /// <para>绌烘皵璐ㄩ噺浼犳劅鍣�</para> + /// <para>璁惧ID涓�0x0302</para> + /// <para>瀹氫箟瀵硅薄锛欰irQualitySensor</para> + /// </summary> + AirQualitySensor = 0x0302, + } + + /// <summary> + /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�) + /// </summary> + public enum DeviceFunctionType + { + /// <summary> + /// 杩樻病鏈夋寚瀹氫负浠�涔堢被鍨� + /// </summary> + A鏈畾涔� = -1, + /// <summary> + /// 鎵嬪姩鎸囧畾瀹冧负涓嶆寚鍚戜换浣曠被鍨� + /// </summary> + A涓嶆寚瀹� = 0, + /// <summary> + /// 寮�鍏� + /// </summary> + A寮�鍏� = 1, + /// <summary> + /// 鐏厜 + /// </summary> + A鐏厜 = 2, + /// <summary> + /// 鎻掑骇 + /// </summary> + A鎻掑骇 = 3 } } -- Gitblit v1.8.0