From 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:52:06 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/R.cs | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 216 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 9fd3b3f..bd4528c 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -330,11 +330,7 @@
/// </summary>
public const int GetPanelProximityFail = 233;
/// <summary>
- /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
- /// </summary>
- public const int DeviceModelId2310 = 234;
- /// <summary>
- /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
+ /// 鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
/// </summary>
public const int AddFreshAirPanelMsg = 235;
/// <summary>
@@ -511,9 +507,9 @@
/// </summary>
public const int InvalidTimeIsEmpty = 297;
/// <summary>
- /// 澶辨晥鏃堕棿涓嶈兘澶т簬36灏忔椂
+ /// 澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
/// </summary>
- public const int InvalidTimeMoreThan36 = 298;
+ public const int InvalidTimeMoreThan72 = 298;
/// <summary>
/// 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
/// </summary>
@@ -526,7 +522,54 @@
/// 闈炵鐞嗗憳涓嶈兘鍦ㄥ父寮�妯″紡涓嬫搷浣�
/// </summary>
public const int OnlyMasterOperate = 301;
-
+ /// <summary>
+ /// 缁戝畾鏂伴
+ /// </summary>
+ public const int BindFreshAirTarget = 302;
+ /// <summary>
+ /// 娓╁害鏉ユ簮
+ /// </summary>
+ public const int TemperatureSource = 303;
+ /// <summary>
+ /// 婀垮害鏉ユ簮
+ /// </summary>
+ public const int HumiditySource = 304;
+ /// <summary>
+ /// PM2.5鏉ユ簮
+ /// </summary>
+ public const int PM25Source = 305;
+ /// <summary>
+ /// 璀﹀憡锛佹娆″父寮�妯″紡榛樿闂ㄩ攣涓�鐩村紑鐫�锛屾病鏈夊疄鐜拌嚜鍔ㄥ叧闂姛鑳�
+ /// </summary>
+ public const int AddLogicNormallyModeFailed = 307;
+ /// <summary>
+ /// 璀﹀憡锛佹椂鏁堟�у父寮�鍒犻櫎澶辫触銆�
+ /// </summary>
+ public const int CancelLogicNormallyModeFailed = 308;
+ /// <summary>
+ /// 鏃舵晥鎬у父寮�鍒犻櫎澶辫触锛岀户缁�滃父寮�妯″紡鈥濊鍓嶅線闂ㄩ攣鐢ㄦ埛鐣岄潰璁剧疆
+ /// </summary>
+ public const int CancelLogicNormallyModeFailed2 = 309;
+ /// <summary>
+ /// 璇疯緭鍏ュ悎娉曠殑鏁板瓧
+ /// </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;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -784,6 +827,29 @@
public readonly static int openmode = 5380;
public readonly static int addnull = 5381;
public readonly static int look = 5382;
+ public readonly static int closeUp = 5383;
+ public readonly static int yearSone = 5384;
+ public readonly static int monthSone = 5385;
+ public readonly static int daySone = 5386;
+ 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;
+
+
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -1110,9 +1176,9 @@
/// </summary>
public const int BelongZone = 11015;
/// <summary>
- /// 鎵�灞炴ā鍧�
+ /// 鎵�灞炶澶�
/// </summary>
- public const int BelongModel = 11016;
+ public const int BelongDevice = 11016;
/// <summary>
/// 鏈煡
/// </summary>
@@ -1142,7 +1208,7 @@
/// </summary>
public const int Cancel = 11023;
/// <summary>
- /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+ /// 娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
/// </summary>
public const int NoScene = 11024;
/// <summary>
@@ -4736,7 +4802,7 @@
/// </summary>
public const int uGetPictrueFromAlbum = 15874;
/// <summary>
- /// 鍑虹幇鏈煡閿欒
+ /// 鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
/// </summary>
public const int uUnKnownError = 15875;
/// <summary>
@@ -5580,17 +5646,122 @@
/// </summary>
public const int uEditorSceneNameFail = 16087;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅8锛氬父寮�妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+ /// 闂ㄩ攣鎶ヨ淇℃伅9锛氬父寮�妯″紡寮�鍚�(缃戝叧瑙﹀彂)
/// </summary>
public const int uDoorLockAlarmMsg9 = 16088;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅8锛氬父寮�妯″紡缁撴潫(缃戝叧瑙﹀彂)
+ /// 闂ㄩ攣鎶ヨ淇℃伅10锛氬父寮�妯″紡缁撴潫(缃戝叧瑙﹀彂)
/// </summary>
public const int uDoorLockAlarmMsg10 = 16089;
/// <summary>
/// 甯稿紑妯″紡
/// </summary>
public const int uNormallyOpenMode = 16090;
+ /// <summary>
+ /// 甯稿紑妯″紡鎵嬪姩寮�鍚�
+ /// </summary>
+ public const int uNormallyOpenModeManualOpen = 16091;
+ /// <summary>
+ /// 甯稿紑妯″紡鎵嬪姩鍙栨秷
+ /// </summary>
+ public const int uNormallyOpenModeManualClose = 16092;
+ /// <summary>
+ /// 甯稿紑妯″紡鍚敤{0}灏忔椂
+ /// </summary>
+ public const int uNormallyOpenModeOpenSomeTime = 16093;
+ /// <summary>
+ /// 鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+ /// </summary>
+ public const int uYouAccessHadChangedPleaseTakeToAdmin = 16094;
+ /// <summary>
+ /// 鎴戝凡闃呰骞跺悓鎰�
+ /// </summary>
+ public const int uMyHadReadAndAgree = 16095;
+ /// <summary>
+ /// 闅愮鏉冩斂绛�
+ /// </summary>
+ public const int uPrivacyPolicy = 16096;
+ /// <summary>
+ /// 鍜�
+ /// </summary>
+ public const int uAnd = 16097;
+ /// <summary>
+ /// 鏈嶅姟鏉℃
+ /// </summary>
+ public const int uTermsOfService = 16098;
+ /// <summary>
+ /// 璇峰厛闃呰骞跺悓鎰忋�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��
+ /// </summary>
+ public const int uPleaseReadAndAgreePrivacyPolicyMsg = 16099;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅11锛氬父寮�妯″紡寮�鍚�(鑷姩鍖栬Е鍙�)
+ /// </summary>
+ public const int uDoorLockAlarmMsg11 = 16100;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅12锛氬父寮�妯″紡缁撴潫(鑷姩鍖栬Е鍙�)
+ /// </summary>
+ public const int uDoorLockAlarmMsg12 = 16101;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅13锛氫复鏃跺瘑鐮佸紑閿佹垚鍔�
+ /// </summary>
+ public const int uDoorLockAlarmMsg13 = 16102;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅14锛氫复鏃跺瘑鐮佸紑閿佸け璐�
+ /// </summary>
+ public const int uDoorLockAlarmMsg14 = 16103;
+ /// <summary>
+ /// 鐢垫満绌鸿皟妯″潡
+ /// </summary>
+ public const int uSaecAirConditioningModule = 16104;
+ /// <summary>
+ /// 涓滆姖绌鸿皟妯″潡
+ /// </summary>
+ public const int uToshibaAirConditioningModule = 16105;
+ /// <summary>
+ /// 鏍煎姏绌鸿皟妯″潡
+ /// </summary>
+ public const int uGreeAirConditioningModule = 16106;
+ /// <summary>
+ /// 缇庣殑绌鸿皟妯″潡
+ /// </summary>
+ public const int uMideaAirConditioningModule = 16107;
+ /// <summary>
+ /// 铏氭嫙缃戝叧
+ /// </summary>
+ public const int uVirtualGateway = 16108;
+ /// <summary>
+ /// 鐜勫叧
+ /// </summary>
+ public const int uVestibule = 16109;
+ /// <summary>
+ /// 鍘ㄦ埧
+ /// </summary>
+ public const int uKitchen = 16110;
+ /// <summary>
+ /// 璧板粖
+ /// </summary>
+ public const int uCorridor = 16111;
+ /// <summary>
+ /// 铏氭嫙璐﹀彿
+ /// </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;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5802,15 +5973,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>
@@ -5821,6 +5992,10 @@
/// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorCeilingGasMsg = 21023;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
@@ -5976,7 +6151,18 @@
/// 闀滃儚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;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6051,6 +6237,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鏂囦欢閲岄潰鈽呪槄鈽呪槄
@@ -6156,5 +6346,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