From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs | 101 +++++++++++++++++++++++---------------------------
1 files changed, 47 insertions(+), 54 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
index 8b34259..cbbb6fa 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,39 +12,40 @@
/// </summary>
OnOffSwitch = 0,
/// <summary>
- /// 杞崲鍣�
- /// <para>璁惧ID涓�53251</para>
- /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
- /// </summary>
- Transverter = 0xD003,
-
- /// <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,
-
+ /// <summary>
+ /// 绐楀笜璁惧ID
+ /// <para>Rollershade:鍗峰笜</para>
+ /// </summary>
+ WindowCoveringDevice = 514,
+ /// <summary>
+ /// 璁惧ID涓�528鐨勮澶�
+ /// <para>棰滆壊璋冨厜鐏細鏀寔浜害/鑹插害/楗卞拰搴�</para>
+ /// <para>璋冨厜璁惧</para>
+ /// </summary>
+ ColorDimmableLight = 528,
+ /// <summary>
+ /// 鎭掓俯鍣�
+ /// <para>璁惧ID涓�769</para>
+ /// <para>瀹氫箟瀵硅薄锛欰C</para>
+ /// </summary>
+ Thermostat = 769,
/// <summary>
/// 瀹夐槻璁惧
/// <para>璁惧ID涓�1026鐨勮澶�</para>
@@ -65,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>
@@ -102,6 +71,30 @@
/// <para>璁惧ID涓�0</para>
/// <para>瀹氫箟瀵硅薄锛歅anel</para>
/// </summary>
- OtaDevice = 49153,
+ OtaDevice = 49153,
+ /// 杞崲鍣�
+ /// <para>璁惧ID涓�53251</para>
+ /// <para>瀹氫箟瀵硅薄锛歍ransverter</para>
+ /// </summary>
+ Transverter = 0xD003,
+ }
+
+ /// <summary>
+ /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�)
+ /// </summary>
+ public enum DeviceFunctionType
+ {
+ /// <summary>
+ /// 寮�鍏�
+ /// </summary>
+ A寮�鍏� = 1,
+ /// <summary>
+ /// 鐏厜
+ /// </summary>
+ A鐏厜 = 2,
+ /// <summary>
+ /// 鎻掑骇
+ /// </summary>
+ A鎻掑骇 = 3
}
}
--
Gitblit v1.8.0