From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 14:10:22 +0800
Subject: [PATCH] 上传一个很特别的新版本
---
ZigbeeApp/Shared/R.cs | 274 +++++-------------------------------------------------
1 files changed, 29 insertions(+), 245 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
index 646002c..aef72af
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -958,7 +958,7 @@
/// <summary>
- /// HDL Home
+ /// Evoyo Home
/// </summary>
public const int AppName = 10000;
/// <summary>
@@ -5817,12 +5817,35 @@
/// <summary>
/// 闇�閲嶆柊缁戝畾
/// </summary>
- public const int uNeedToRebind = 16136;
- /// <summary>
- /// 鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ public const int uNeedToRebind = 16136;
+ /// <summary>
+ /// 鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
/// </summary>
public const int uUnKnownErrorAndLostData = 16137;
-
+ /// <summary>
+ /// 鐑熼浘浼犳劅鍣�
+ /// </summary>
+ public const int uSensorFire = 16138;
+ /// <summary>
+ /// 姘翠镜浼犳劅鍣�
+ /// </summary>
+ public const int uSensorWater = 16139;
+ /// <summary>
+ /// 鐕冩皵浼犳劅鍣�
+ /// </summary>
+ public const int uSensorCarbonMonoxide = 16140;
+ /// <summary>
+ /// 绱ф�ユ寜閽�
+ /// </summary>
+ public const int uSensorEmergencyButton = 16141;
+ /// <summary>
+ /// 闂ㄧ獥浼犳劅鍣�
+ /// </summary>
+ public const int uSensorDoorWindow = 16142;
+ /// <summary>
+ /// 閽ュ寵鎵�
+ /// </summary>
+ public const int uKeyfob = 16143;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -6063,193 +6086,8 @@
/// </summary>
public const int uAddSensorSphericalMotionMsg = 21024;
- //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
- /// <summary>
- /// 闀滃儚ID涓�1305(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱揣鎬ユ寜閽�
- /// </summary>
- public const int uDeviceModelId1305 = 30000;
- /// <summary>
- /// 闀滃儚ID涓�1300(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱噧姘斾紶鎰熷櫒
- /// </summary>
- public const int uDeviceModelId1300 = 30001;
- /// <summary>
- /// 闀滃儚ID涓�1302(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱儫闆句紶鎰熷櫒
- /// </summary>
- public const int uDeviceModelId1302 = 30002;
- /// <summary>
- /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭按娴镐紶鎰熷櫒
- /// </summary>
- public const int uDeviceModelId1304 = 30003;
- /// <summary>
- /// 閽ュ寵鎵�
- /// </summary>
- public const int uKeyfob = 30004;
- /// <summary>
- /// 闀滃儚ID涓�1301(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氶棬绐椾紶鎰熷櫒
- /// </summary>
- public const int uDeviceModelId1301 = 30005;
- /// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭櫤鑳界┖寮�
- /// </summary>
- public const int uDeviceModelId4100 = 30006;
- /// <summary>
- /// 闀滃儚ID涓�100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
- /// </summary>
- public const int uDeviceModelId100 = 30007;
- /// <summary>
- /// 闀滃儚ID涓�200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇)
- /// </summary>
- public const int uDeviceModelId200 = 30008;
- /// <summary>
- /// 闀滃儚ID涓�1200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�220Pir浼犳劅鍣�
- /// </summary>
- public const int uDeviceModelId1200 = 30009;
- /// <summary>
- /// 闀滃儚ID涓�1鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
- /// </summary>
- public const int uDeviceModelId1 = 30010;
- /// <summary>
- /// 闀滃儚ID涓�201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇)
- /// </summary>
- public const int uDeviceModelId201 = 30011;
- /// <summary>
- /// 闀滃儚ID涓�202鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇)
- /// </summary>
- public const int uDeviceModelId202 = 30012;
- /// <summary>
- /// 闀滃儚ID涓�2300鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3璺户鐢靛櫒灏忔ā鍧�
- /// </summary>
- public const int uDeviceModelId2300 = 30013;
- /// <summary>
- /// 闀滃儚ID涓�6鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
- /// </summary>
- public const int uDeviceModelId6 = 30014;
- /// <summary>
- /// 闀滃儚ID涓�0鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳皟璇曡澶�
- /// </summary>
- public const int uDeviceModelId0 = 30015;
- /// <summary>
- /// 闀滃儚ID涓�101鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘绠＄姸鐢垫満
- /// </summary>
- public const int uDeviceModelId101 = 30016;
- /// <summary>
- /// 闀滃儚ID涓�3900鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氫腑缁у櫒
- /// </summary>
- public const int uDeviceModelId3900 = 30017;
- /// <summary>
- /// 闀滃儚ID涓�203鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇)
- /// </summary>
- public const int uDeviceModelId203 = 30018;
- /// <summary>
- /// 闀滃儚ID涓�210鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(鍙甫鐢垫簮搴曞骇)
- /// </summary>
- public const int uDeviceModelId210 = 30019;
- /// <summary>
- /// 闀滃儚ID涓�1303(鏆傚畾)鐨勫畼鏂圭殑榛樿鍚嶅瓧锛氱孩澶栦紶鎰熷櫒
- /// </summary>
- public const int uDeviceModelId1303 = 30020;
- /// <summary>
- /// 闀滃儚ID涓�2500鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1璺皟鍏夊櫒灏忔ā鍧�
- /// </summary>
- public const int uDeviceModelId2500 = 30021;
- /// <summary>
- /// 闀滃儚ID涓�4200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞琤uspro鍗忚杞崲鍣�
- /// </summary>
- public const int uDeviceModelId4200 = 30022;
- /// <summary>
- /// 闀滃儚ID涓�4201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞�485鍗忚杞崲鍣�
- /// </summary>
- public const int uDeviceModelId4201 = 30023;
- /// <summary>
- /// 闀滃儚ID涓�3600鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee绌鸿皟缃戝叧妯″潡
- /// </summary>
- public const int uDeviceModelId3600 = 30024;
- /// <summary>
- /// 闀滃儚ID涓�2800鐨勮澶囩殑瀹樻柟鍚嶅瓧锛欻06C
- /// </summary>
- public const int uDeviceModelId2800 = 30025;
- /// <summary>
- /// 闀滃儚ID涓�220鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
- /// </summary>
- public const int uDeviceModelId220 = 30026;
- /// <summary>
- /// 闀滃儚ID涓�221鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
- /// </summary>
- public const int uDeviceModelId221 = 30027;
- /// <summary>
- /// 闀滃儚ID涓�222鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
- /// </summary>
- public const int uDeviceModelId222 = 30028;
- /// <summary>
- /// 闀滃儚ID涓�240鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�2鎸夐敭杞昏Е寮忛潰鏉�
- /// </summary>
- public const int uDeviceModelId240 = 30029;
- /// <summary>
- /// 闀滃儚ID涓�241鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�4鎸夐敭杞昏Е寮忛潰鏉�
- /// </summary>
- public const int uDeviceModelId241 = 30030;
- /// <summary>
- /// 闀滃儚ID涓�242鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�8鎸夐敭杞昏Е寮忛潰鏉�
- /// </summary>
- public const int uDeviceModelId242 = 30031;
- /// <summary>
- /// 闀滃儚ID涓�250鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮︽柊椋庨潰鏉�
- /// </summary>
- public const int uDeviceModelId250 = 30032;
- /// <summary>
- /// 闀滃儚ID涓�253鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮︾幆澧冮潰鏉�
- /// </summary>
- public const int uDeviceModelId253 = 30033;
- /// <summary>
- /// 闀滃儚ID涓�224鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭鍦烘櫙闈㈡澘
- /// </summary>
- public const int uDeviceModelId224 = 30034;
- /// <summary>
- /// 闀滃儚ID涓�226鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�2璺獥甯橀潰鏉�
- /// </summary>
- public const int uDeviceModelId226 = 30035;
- /// <summary>
- /// 闀滃儚ID涓�256鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�/2璺獥甯橀潰鏉�-Z
- /// </summary>
- public const int uDeviceModelId256 = 30036;
- /// <summary>
- /// 闀滃儚ID涓�2802鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歋-one
- /// </summary>
- public const int uDeviceModelId2802 = 30037;
- /// <summary>
- /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
- /// </summary>
- public const int uDeviceModelId2310 = 30038;
- /// <summary>
- /// 闀滃儚ID涓�1306鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鍚搁《鐕冩皵浼犳劅鍣�
- /// </summary>
- public const int uDeviceModelId1306 = 30039;
- /// <summary>
- /// 闀滃儚ID涓�1307鐨勮澶囩殑榛樿鍚嶅瓧锛歅M2.5绌烘皵璐ㄩ噺浼犳劅鍣�
- /// </summary>
- public const int uDeviceModelId1307 = 30040;
- /// <summary>
- /// 闀滃儚ID涓�212鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾﹀鍔熻兘闈㈡澘
- /// </summary>
- public const int uDeviceModelId212 = 30041;
- /// <summary>
- /// 闀滃儚ID涓�230鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾︾幆澧冮潰鏉�
- /// </summary>
- public const int uDeviceModelId230 = 30042;
- /// <summary>
- /// 闀滃儚ID涓�11鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歁ini缃戝叧
- /// </summary>
- public const int uDeviceModelId11 = 30043;
- /// <summary>
- /// 闀滃儚ID涓�20000鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳壊娓╃伅
- /// </summary>
- public const int uDeviceModelId20000 = 30044;
- /// <summary>
- /// 闀滃儚ID涓�1205鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱悆鍨嬬Щ鍔ㄤ紶鎰熷櫒
- /// </summary>
- public const int uDeviceModelId1205 = 30045;
- //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮� 娉細杩欎簺鎵�灞濱D宸茬粡涓嶅啀缁存姢鈽呪槄鈽呪槄
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼
/// </summary>
@@ -6259,53 +6097,9 @@
/// </summary>
public const int uDeviceBelongId200 = 40001;
/// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�1200鐨勭炕璇戝悕瀛楋細浼犳劅鍣�
- /// </summary>
- public const int uDeviceBelongId1200 = 40002;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�2300鐨勭炕璇戝悕瀛楋細缁х數鍣�
- /// </summary>
- public const int uDeviceBelongId2300 = 40003;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�2500鐨勭炕璇戝悕瀛楋細璋冨厜鍣�
- /// </summary>
- public const int uDeviceBelongId2500 = 40004;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細闂ㄩ攣
- /// </summary>
- public const int uDeviceBelongId2800 = 40005;
- /// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�3600鐨勭炕璇戝悕瀛楋細绌鸿皟
/// </summary>
public const int uDeviceBelongId3600 = 40006;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�3900鐨勭炕璇戝悕瀛楋細涓户鍣�
- /// </summary>
- public const int uDeviceBelongId3900 = 40007;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細鏅鸿兘绌哄紑
- /// </summary>
- public const int uDeviceBelongId4100 = 40008;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�4200鐨勭炕璇戝悕瀛楋細杞崲鍣�
- /// </summary>
- public const int uDeviceBelongId4200 = 40009;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�9鐨勭炕璇戝悕瀛楋細褰╃伅
- /// </summary>
- public const int uDeviceBelongId9 = 40010;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╂箍搴︿紶鎰熷櫒
- /// </summary>
- public const int uDeviceBelongId10 = 40011;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�11鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
- /// </summary>
- public const int uDeviceBelongId11 = 40012;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�12鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
- /// </summary>
- public const int uDeviceBelongId12 = 40013;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏�
/// </summary>
@@ -6318,21 +6112,11 @@
/// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜
/// </summary>
public const int uDeviceBelongId15 = 40016;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
- /// </summary>
- public const int uDeviceBelongId16 = 40017;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�2310鐨勭炕璇戝悕瀛楋細鏂伴
/// </summary>
public const int uDeviceBelongId2310 = 40018;
- /// <summary>
- /// 鑷畾涔夎澶囨墍灞濱D涓�1307鐨勭炕璇戝悕瀛楋細绌烘皵璐ㄩ噺
- /// </summary>
- public const int uDeviceBelongId1307 = 40019;
- //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
- //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭ｉ噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0