From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 16:39:59 +0800
Subject: [PATCH] 2020-05-18-2
---
ZigbeeApp/Shared/R.cs | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 49e7bfe..d7b2d33
--- 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;
@@ -822,6 +826,22 @@
public readonly static int numberSone = 5387;
public readonly static int openAutomationSone = 5388;
public readonly static int timeSetSone= 5389;
+ public readonly static int invalidSetting = 5390;
+ public readonly static int hour = 5391;
+ public readonly static int lockOpen = 5392;
+ public readonly static int setDoorLockOpen = 5393;
+ public readonly static int less = 5394;
+ public readonly static int more = 5395;
+ public readonly static int or = 5396;
+ public readonly static int timeNull = 5397;
+ public readonly static int numberInput = 5398;
+ public readonly static int closeFailed = 5399;
+ public readonly static int openFailed = 5400;
+ public readonly static int addFailed = 5401;
+ public readonly static int timeSensitive = 5402;
+ public readonly static int executeSone = 5403;
+ public readonly static int hour1 = 5404;
+
#region 鐧诲綍娉ㄥ唽
@@ -5726,6 +5746,11 @@
/// 鐏叏鍏�
/// </summary>
public const int uAllLightClose = 16114;
+ /// <summary>
+ /// 甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+ /// </summary>
+ public const int uNormallyOpenLogicManualClose = 16115;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5956,6 +5981,10 @@
/// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorCeilingGasMsg = 21023;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
@@ -6115,6 +6144,10 @@
/// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
/// </summary>
public const int uDeviceModelId2310 = 30038;
+ /// <summary>
+ /// 闀滃儚ID涓�1306鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鍚搁《鐕冩皵浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceModelId1306 = 30039;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6189,6 +6222,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鏂囦欢閲岄潰鈽呪槄鈽呪槄
@@ -6294,5 +6331,9 @@
/// 鏅鸿兘绌哄紑
/// </summary>
public const int uDeviceDirectionName25 = 70024;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName26 = 70025;
}
}
--
Gitblit v1.8.0