From af0266fa5570b6adcdb22f631bf13170e8646ca5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:15:21 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/R.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 990a82a..7198b3a
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -793,6 +793,10 @@
/// </summary>
public const int UnknowDevice = 12100;
/// <summary>
+ /// 鎺у埗闈㈡澘
+ /// </summary>
+ public const int OnOffSwitch = 12101;
+ /// <summary>
/// 缁х數鍣�
/// </summary>
public const int OnOffOutput = 12102;
@@ -1089,7 +1093,7 @@
//*****public static readonly int Function = 11038;
-
+
public static readonly int AddFunction = 11042;
public static readonly int Light = 11044;
@@ -1171,7 +1175,7 @@
/// 鏃堕棿闂撮殧
/// </summary>
public static readonly int TimeSpan = 11093;
-
+
@@ -1307,10 +1311,10 @@
///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
/// </summary>
public static readonly int NoDeviceCanAddToRoom = 12034;
-
-
-
+
+
+
/// <summary>
/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
--
Gitblit v1.8.0