From f759dc1e6f49c53733eafda82207c85af18f9931 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 28 五月 2020 15:46:54 +0800
Subject: [PATCH] 2020-05-28-1
---
ZigbeeApp/Shared/R.cs | 149 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 139 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
index 59ba6f3..a78715a
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -330,7 +330,7 @@
/// </summary>
public const int GetPanelProximityFail = 233;
/// <summary>
- /// 鎸変綇闈㈡澘妯″紡
+ /// 鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
/// </summary>
public const int AddFreshAirPanelMsg = 235;
/// <summary>
@@ -554,6 +554,55 @@
/// 璇疯緭鍏ュ悎娉曠殑鏁板瓧
/// </summary>
public const int IllegalNumber = 310;
+ /// <summary>
+ /// 鎵嬪姩
+ /// </summary>
+ public const int Manual = 311;
+ /// <summary>
+ /// 鑳屽厜鐏鑹�
+ /// </summary>
+ public const int BackgroundLightColor = 312;
+ /// <summary>
+ /// PM2.5鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�備俊鍙峰浘鏍囧父浜垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int AddSensorPMMsg = 313;
+ /// <summary>
+ /// 鑷姩妯″紡涓嶆敮鎸佹搷浣�
+ /// </summary>
+ public const int AutoModeForbiddenOperate = 314;
+ /// <summary>
+ /// 绌烘皵璐ㄩ噺
+ /// </summary>
+ public const int AirQuality = 315;
+ /// <summary>
+ /// 绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ public const int AirQualitySensor = 316;
+ /// <summary>
+ /// 浼�
+ /// </summary>
+ public const int ExcellentAirQuality = 317;
+ /// <summary>
+ /// 鑹�
+ /// </summary>
+ public const int GoodAirQuality = 318;
+ /// <summary>
+ /// 杞诲害姹℃煋
+ /// </summary>
+ public const int LightPollution = 319;
+ /// <summary>
+ /// 涓害姹℃煋
+ /// </summary>
+ public const int Moderatelyolluted = 320;
+ /// <summary>
+ /// 閲嶅害姹℃煋
+ /// </summary>
+ public const int HeavyPollution = 321;
+ /// <summary>
+ /// 涓ラ噸姹℃煋
+ /// </summary>
+ public const int SeriousPollution = 322;
+
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -817,7 +866,23 @@
public readonly static int daySone = 5386;
public readonly static int numberSone = 5387;
public readonly static int openAutomationSone = 5388;
- public readonly static int timeSetone = 5389;
+ 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 鐧诲綍娉ㄥ唽
@@ -1145,9 +1210,9 @@
/// </summary>
public const int BelongZone = 11015;
/// <summary>
- /// 鎵�灞炴ā鍧�
+ /// 鎵�灞炶澶�
/// </summary>
- public const int BelongModel = 11016;
+ public const int BelongDevice = 11016;
/// <summary>
/// 鏈煡
/// </summary>
@@ -1177,7 +1242,7 @@
/// </summary>
public const int Cancel = 11023;
/// <summary>
- /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+ /// 娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
/// </summary>
public const int NoScene = 11024;
/// <summary>
@@ -5714,6 +5779,42 @@
/// 铏氭嫙璐﹀彿
/// </summary>
public const int uVirtualAccount = 16112;
+ /// <summary>
+ /// 鐏叏寮�
+ /// </summary>
+ public const int uAllLightOpen = 16113;
+ /// <summary>
+ /// 鐏叏鍏�
+ /// </summary>
+ public const int uAllLightClose = 16114;
+ /// <summary>
+ /// 甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
+ /// </summary>
+ public const int uNormallyOpenLogicManualClose = 16115;
+ /// <summary>
+ /// 娓稿浣撻獙
+ /// </summary>
+ public const int uExperienceAccount = 16116;
+ /// <summary>
+ /// 鏅鸿兘鏀瑰彉鐢熸椿 | Enjoy smart life
+ /// </summary>
+ public const int uLogoPageText = 16117;
+ /// <summary>
+ /// 缃戠粶涓嶇ǔ瀹氾紝鍦烘櫙鍒楄〃淇℃伅缂烘崯
+ /// </summary>
+ public const int uNetworkUnStableAndSceneInfoIsNotFull = 16118;
+ /// <summary>
+ /// DATA缁胯壊鎸囩ず鐏棯鐑�
+ /// </summary>
+ public const int uDataGreanPilotLampLinght = 16119;
+ /// <summary>
+ /// 鑱旂郴鏂瑰紡
+ /// </summary>
+ public const int uContactInformation = 16120;
+ /// <summary>
+ /// 璇疯緭鍏ユ偍鐨勮仈绯绘柟寮�
+ /// </summary>
+ public const int uPleaseInputYourContactInformation = 16121;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5914,7 +6015,7 @@
/// </summary>
public const int uAddRepeaterZigbeeMsg = 21014;
/// <summary>
- /// 绌鸿皟 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+ /// 绌鸿皟 -> 闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,{0}棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
/// </summary>
public const int uAddAirConditionerZbGatewayMsg = 21015;
/// <summary>
@@ -5926,15 +6027,15 @@
/// </summary>
public const int uAddSensorTemperatureAndHumidityMsg = 21017;
/// <summary>
- /// 鏂规偊2鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// 鍗曞紑鍙屾帶闈㈡澘 -> 闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
/// </summary>
public const int uAddFangyueTwoButtonPanelMsg = 21018;
/// <summary>
- /// 鏂规偊4鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// 鍙屽紑鍥涙帶闈㈡澘 -> 闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
/// </summary>
public const int uAddFangyueFourButtonPanelMsg = 21019;
/// <summary>
- /// 鏂规偊8鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// 鍥涘紑鍏帶闈㈡澘-> 闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
/// </summary>
public const int uAddFangyueEightButtonPanelMsg = 21020;
/// <summary>
@@ -5945,6 +6046,10 @@
/// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorCeilingGasMsg = 21023;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
@@ -6103,7 +6208,15 @@
/// <summary>
/// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
/// </summary>
- public const int DeviceModelId2310 = 30038;
+ 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;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6178,6 +6291,14 @@
/// 鑷畾涔夎澶囨墍灞濱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鏂囦欢閲岄潰鈽呪槄鈽呪槄
@@ -6283,5 +6404,13 @@
/// 鏅鸿兘绌哄紑
/// </summary>
public const int uDeviceDirectionName25 = 70024;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName26 = 70025;
+ /// <summary>
+ /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName27 = 70026;
}
}
--
Gitblit v1.8.0