From 0bf9e65bc3ba98391e7835c922b15baab3c77876 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 01 六月 2020 14:59:39 +0800
Subject: [PATCH] 上传一个合并的版本
---
ZigbeeApp/Shared/R.cs | 202 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 194 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index e488250..02bf071 100755
--- 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>
@@ -558,6 +558,70 @@
/// 鎵嬪姩
/// </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;
+ /// <summary>
+ /// 闂ㄩ攣甯稿紑妯″紡宸插叧
+ /// </summary>
+ public const int NormallyClosed = 323;
+ /// <summary>
+ /// 鍏ョ綉
+ /// </summary>
+ public const int Connection = 324;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘 -> 鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
+ /// </summary>
+ public const int AddSimpleMultifunctionMsg = 325;
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉� -> 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
+ /// </summary>
+ public const int AddSimpleEnvironmentMsg = 326;
+ /// <summary>
+ /// 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+ /// </summary>
+ public const int LongPressButtonSwitch = 327;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -822,6 +886,23 @@
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;
+ public readonly static int mi = 5405;
+
#region 鐧诲綍娉ㄥ唽
@@ -1181,7 +1262,7 @@
/// </summary>
public const int Cancel = 11023;
/// <summary>
- /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+ /// 娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
/// </summary>
public const int NoScene = 11024;
/// <summary>
@@ -5191,7 +5272,7 @@
/// </summary>
public const int uSendPasswordFail = 15980;
/// <summary>
- /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// 璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
/// </summary>
public const int uPleaseSelectGatewayXXNet = 15981;
/// <summary>
@@ -5730,6 +5811,62 @@
/// 甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
/// </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;
+ /// <summary>
+ /// 璇ュ唴瀹逛笉鑳界渷鐣�
+ /// </summary>
+ public const int uThisContentCanNotOmitted = 16122;
+ /// <summary>
+ /// Mini缃戝叧
+ /// </summary>
+ public const int uMiniGateway = 16123;
+ /// <summary>
+ /// 娣诲姞Mini缃戝叧
+ /// </summary>
+ public const int uAddMiniGateway = 16124;
+ /// <summary>
+ /// 鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// </summary>
+ public const int uAddMiniGatewayMsg1 = 16125;
+ /// <summary>
+ /// 璇烽�夋嫨widora-xxxx缃戠粶
+ /// </summary>
+ public const int uPleaseSelectWidoraXXNet = 16126;
+ /// <summary>
+ /// 鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}閫夋嫨widora-xxxx缃戠粶
+ /// </summary>
+ public const int uAddMiniGatewayMsg2 = 16127;
+ /// <summary>
+ /// 鑹叉俯
+ /// </summary>
+ public const int uColorTemperature = 16128;
+ /// <summary>
+ /// Mini澶滅伅
+ /// </summary>
+ public const int uMiniNightLight = 16129;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5930,7 +6067,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>
@@ -5942,15 +6079,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>
@@ -5961,6 +6098,10 @@
/// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorCeilingGasMsg = 21023;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
@@ -6120,7 +6261,27 @@
/// 闀滃儚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;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼
@@ -6194,6 +6355,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鏂囦欢閲岄潰鈽呪槄鈽呪槄
@@ -6299,5 +6468,22 @@
/// 鏅鸿兘绌哄紑
/// </summary>
public const int uDeviceDirectionName25 = 70024;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName26 = 70025;
+ /// <summary>
+ /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName27 = 70026;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName28 = 70027;
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉�
+ /// </summary>
+ public const int uDeviceDirectionName29 = 70028;
+
}
}
--
Gitblit v1.8.0