From 6817ec660fcf032ed94a4197b145ad1e96c2aeed Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 06 五月 2020 17:40:34 +0800
Subject: [PATCH] 2020-05-06-2

---
 ZigbeeApp/Shared/R.cs |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
index 7743eee..11d8f17
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -558,6 +558,10 @@
         /// 鎵嬪姩
         /// </summary>
         public const int Manual = 311;
+        /// <summary>
+        /// 鑳屽厜鐏鑹�
+        /// </summary>
+        public const int BackgroundLightColor = 312;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -5734,6 +5738,11 @@
         /// 鐏叏鍏�
         /// </summary>
         public const int uAllLightClose = 16114;
+        /// <summary>
+        /// 甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+        /// </summary>
+        public const int uNormallyOpenLogicManualClose = 16115;
+
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -5964,6 +5973,10 @@
         /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔� 
         /// </summary>
         public const int uAddCurtaunPanelMsg = 21022;
+        /// <summary>
+        /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorCeilingGasMsg = 21023;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
@@ -6123,6 +6136,10 @@
         /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
         /// </summary>
         public const int uDeviceModelId2310 = 30038;
+        /// <summary>
+        /// 闀滃儚ID涓�1306鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鍚搁《鐕冩皵浼犳劅鍣�
+        /// </summary>
+        public const int uDeviceModelId1306 = 30039;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -6197,6 +6214,10 @@
         /// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
         /// </summary>
         public const int uDeviceBelongId16 = 40017;
+        /// <summary>
+        /// 鑷畾涔夎澶囨墍灞濱D涓�2310鐨勭炕璇戝悕瀛楋細鏂伴
+        /// </summary>
+        public const int uDeviceBelongId2310 = 40018;
 
         //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
         //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
@@ -6302,5 +6323,9 @@
         /// 鏅鸿兘绌哄紑
         /// </summary>
         public const int uDeviceDirectionName25 = 70024;
+        /// <summary>
+        /// 鍚搁《鐕冩皵浼犳劅鍣�
+        /// </summary>
+        public const int uDeviceDirectionName26 = 70025;
     }
 }

--
Gitblit v1.8.0