From eed381ca472abb06e386281e604569ebf80bbfe3 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 26 三月 2020 17:51:41 +0800
Subject: [PATCH] 2020-03-26
---
ZigbeeApp/Shared/R.cs | 296 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 268 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 732e838..54e4865
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -316,28 +316,152 @@
public readonly static int DistributeSuccess = 229;
public readonly static int SureToUnFreeze = 230;
- public readonly static int RemindSetting = 548;
- public readonly static int AddNewUser = 650;
- public readonly static int Headshot = 551;
- public readonly static int Edited = 552;
- public readonly static int UneditFingerprint = 553;
- public readonly static int UneditPassword = 554;
- public readonly static int UneditProximityCard = 555;
- public readonly static int EditScence = 556;
- public readonly static int UnEditedScene = 557;
- public readonly static int NewName = 558;
- public readonly static int OldName = 559;
- public readonly static int SystemSetting = 560;
- public readonly static int PasswordList = 561;
- public readonly static int UserRemark = 562;
- public readonly static int UserTempPassword = 563;
- public readonly static int ProximityCard = 564;
- public readonly static int MaxValicCount = 668;
- public readonly static int ValidCount = 670;
- public readonly static int AllRecord = 639;
- public readonly static int ReFresh = 681;
- public static readonly int AccountRegisterSuccess = 691;
+ /// <summary>
+ /// 鎺ヨ繎鎰熷簲
+ /// </summary>
+ public const int ProximitySensors = 231;
+ /// <summary>
+ /// 鎺ヨ繎鎰熷簲鍔熻兘璁剧疆缃け璐�
+ /// </summary>
+ public const int SetPannelProximityFail = 232;
+ /// <summary>
+ /// 鑾峰彇鎺ヨ繎鎰熷簲鍔熻兘澶辫触
+ /// </summary>
+ public const int GetPanelProximityFail = 233;
+ /// <summary>
+ /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
+ /// </summary>
+ public const int DeviceModelId2310 = 234;
+ /// <summary>
+ /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
+ /// </summary>
+ public const int AddFreshAirPanelMsg = 235;
+ /// <summary>
+ ///缁胯壊鎸囩ず鐏棯鐑�
+ /// </summary>
+ public const int GreenLightLighting = 236;
+ /// <summary>
+ /// 鎸囩ず鐏�
+ /// </summary>
+ public const int IndicatorLight = 237;
+ /// <summary>
+ /// 闀挎寜5绉掞紙鎸夐敭锛�
+ /// </summary>
+ public const int LongPressFiveSecond = 238;
+ /// <summary>
+ /// 闀挎寜
+ /// </summary>
+ public const int AddFreshAirModulPanelMsg = 239;
+ /// <summary>
+ /// 闀滃儚ID涓�2802鐨勮澶囩殑榛樿鍚嶅瓧锛歋-one
+ /// </summary>
+ public const int uDeviceModelId2802 = 240;
+ /// <summary>
+ /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+ /// </summary>
+ public const int SetDoorLockNomallyOpen = 241;
+ /// <summary>
+ /// 鐢甸噺
+ /// </summary>
+ public const int DoorLockPower = 242;
+ /// <summary>
+ /// 甯稿紑妯″紡宸插紑鍚�
+ /// </summary>
+ public const int NomallyModeIsTurnOn = 243;
+ /// <summary>
+ /// 澶辨晥璁剧疆
+ /// </summary>
+ public const int DoorLockInValidSetting = 244;
+ /// <summary>
+ /// 鑷姩鍖�
+ /// </summary>
+ public const int DoorLockLogic = 245;
+ /// <summary>
+ /// 闂ㄩ攣濮嬬粓鎵撳紑{0}灏忔椂
+ /// </summary>
+ public const int DoorLockOpenAllTheTime = 246;
+ /// <summary>
+ /// 褰撳墠鏃跺尯
+ /// </summary>
+ public const int DoorLockCurrentZone = 247;
+ /// <summary>
+ /// 鍙栨秷甯稿紑
+ /// </summary>
+ public const int CancelNomallyMode = 248;
+ /// <summary>
+ /// 鎮ㄧ殑甯稿紑妯″紡灏嗚鍙栨秷
+ /// </summary>
+ public const int NomallyModeIsCanceled = 249;
+ /// <summary>
+ /// 淇濇寔甯稿紑
+ /// </summary>
+ public const int KeepNomallyMode = 250;
+ /// <summary>
+ /// 纭鍙栨秷
+ /// </summary>
+ public const int SureCancel = 251;
+ /// <summary>
+ /// (鏈鎿嶄綔浠呬负鍗曟鍙栨秷锛岃嫢闇�瑕佸仠姝㈡墽琛寋0}鑷姩鍖栵紝璇烽�夋嫨鍒嗙被-鑷姩鍖栬繘琛岃缃�)
+ /// </summary>
+ public const int XingTip = 252;
+
+ /// <summary>
+ /// 鑾峰彇闂ㄩ攣甯稿紑妯″紡澶辫触
+ /// </summary>
+ public const int GetNormallyOpenModeFailed = 253;
+ /// <summary>
+ /// 鎵撳紑闂ㄩ攣甯稿紑妯″紡鎴愬姛
+ /// </summary>
+ public const int OpenNormallyOpenModeSuccess = 254;
+ /// <summary>
+ /// 鎵撳紑闂ㄩ攣甯稿紑妯″紡澶辫触
+ /// </summary>
+ public const int OpenNormallyOpenModeFailed = 255;
+ /// <summary>
+ /// 鍏抽棴闂ㄩ攣甯稿紑妯″紡鎴愬姛
+ /// </summary>
+ public const int CloseNormallyOpenModeSuccess = 256;
+ /// <summary>
+ /// 鍏抽棴闂ㄩ攣甯稿紑妯″紡澶辫触
+ /// </summary>
+ public const int CloseNormallyOpenModeFailed = 257;
+ /// <summary>
+ /// 闂ㄩ攣宸茬粡寮�鍚�
+ /// </summary>
+ public const int CurrentNormallyOpenMode = 258;
+ /// <summary>
+ /// 澶辨晥鏃堕棿涓嶅悎娉曪紝璇烽噸鍐欒缃�
+ /// </summary>
+ public const int NormallyOpenModeInvalidTimeTip = 259;
+ /// <summary>
+ /// 闊抽噺璁剧疆澶辫触
+ /// </summary>
+ public const int SetVolumeFailed = 260;
+ /// <summary>
+ /// 闊抽噺璁剧疆鎴愬姛
+ /// </summary>
+ public const int SetVolumeSuccess = 261;
+ /// <summary>
+ /// 褰撳墠鏃跺尯聽
+ /// </summary>
+ public const int CurZone = 262;
+ /// <summary>
+ /// 鍖郝�
+ /// </summary>
+ public const int CurZoneText = 263;
+ /// <summary>
+ /// 涓溌�
+ /// </summary>
+ public const int East = 264;
+ /// <summary>
+ /// 瑗柯�
+ /// </summary>
+ public const int West = 265;
+ /// <summary>
+ /// 褰撳墠璁惧涓嶆敮鎸佽鍔熻兘
+ /// </summary>
+ public const int NoSupport = 266;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -592,6 +716,8 @@
public readonly static int automationaddtext = 5377;
public readonly static int tiptextnull = 5378;
public readonly static int tiplocktextnull = 5379;
+ public readonly static int openmode = 5380;
+ public readonly static int addnull = 5381;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -901,10 +1027,10 @@
/// 缂栬緫
/// </summary>
public const int Edit = 11011;
- /// <summary>
- /// 璁剧疆鍔熻兘
- /// </summary>
- public const int FunctionSetting = 11012;
+ /// <summary>
+ /// 鍔熻兘璁剧疆
+ /// </summary>
+ public const int FunctionSetting = 11012;
/// <summary>
/// 淇℃伅缂栬緫
/// </summary>
@@ -1001,6 +1127,11 @@
/// 娣诲姞寤舵椂
/// </summary>
public const int AddDelayTime = 11036;
+ /// <summary>
+ /// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
+ /// </summary>
+ public const int AC_Model_None = 11037;
+
#region 璁惧绫诲瀷
/// <summary>
@@ -1180,7 +1311,7 @@
/// </summary>
public const int TheRoomIsSharedNotAllowedToOperate = 13120;
/// <summary>
- /// 杩樻病閫夋嫨鎴块棿锛岃鍏堥�夋嫨
+ /// 杩樻病閫夋嫨鍖哄煙锛岃鍏堥�夋嫨
/// </summary>
public const int NotSelectZone = 13121;
/// <summary>
@@ -2163,9 +2294,9 @@
/// </summary>
public const int uBackup = 15225;
/// <summary>
- /// 璇疯緭鍏ュ娉ㄥ悕绉�
+ /// 璇疯緭鍏ュ浠藉悕绉�
/// </summary>
- public const int uPleaseInpuBackup = 15226;
+ public const int uPleaseInpuBackupName = 15226;
/// <summary>
/// 鎭㈠鏂囦欢鎴愬姛
/// </summary>
@@ -5274,6 +5405,62 @@
/// 鍔炲叕瀹�
/// </summary>
public const int uWorkRoom = 16060;
+ /// <summary>
+ /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+ /// </summary>
+ public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+ /// </summary>
+ public const int uGetAirConditionerSwingFunctionFail = 16062;
+ /// <summary>
+ /// 璁剧疆绌鸿皟鎽嗛澶辫触
+ /// </summary>
+ public const int uSetAirConditionerSwingFunctionFail = 16063;
+ /// <summary>
+ /// 鎸変綇姝ゆ寜閿�
+ /// </summary>
+ public const int uPressAndHoldThisKey = 16064;
+ /// <summary>
+ /// 鎸夐敭鎸囩ず鐏寒璧�
+ /// </summary>
+ public const int uKeyIndicatorLightsUp = 16065;
+ /// <summary>
+ /// 鎺ヨ繎鎰熷簲
+ /// </summary>
+ public const int uProximityInduction = 16066;
+ /// <summary>
+ /// 绌鸿皟鐩爣
+ /// </summary>
+ public const int uAirConditionerTarget = 16067;
+ /// <summary>
+ /// 鍦版殩鐩爣
+ /// </summary>
+ public const int uFloorHeatingTarget = 16068;
+ /// <summary>
+ /// 鏂伴鐩爣
+ /// </summary>
+ public const int uNewWindTarget = 16069;
+ /// <summary>
+ /// 灞忓箷浜害绾у埆
+ /// </summary>
+ public const int uScreenBrightnesLevel = 16070;
+ /// <summary>
+ /// 绾�
+ /// </summary>
+ public const int uRank = 16071;
+ /// <summary>
+ /// 鑳屽厜鐏寒搴�
+ /// </summary>
+ public const int uBacklightBrightness = 16072;
+ /// <summary>
+ /// 鎵撳紑
+ /// </summary>
+ public const int uOpen1 = 16073;
+ /// <summary>
+ /// 鏃ョ珛绌鸿皟妯″潡
+ /// </summary>
+ public const int uHitachiAirConditioningModule = 16074;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5485,6 +5672,26 @@
/// 娓╂箍搴︿紶鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
/// </summary>
public const int uAddSensorTemperatureAndHumidityMsg = 21017;
+ /// <summary>
+ /// 鏂规偊2鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddFangyueTwoButtonPanelMsg = 21018;
+ /// <summary>
+ /// 鏂规偊4鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddFangyueFourButtonPanelMsg = 21019;
+ /// <summary>
+ /// 鏂规偊8鎸夐敭杞昏Е寮忛潰鏉� -> 鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅{0}浜捣锛屽垯閰嶇綉鎴愬姛
+ /// </summary>
+ public const int uAddFangyueEightButtonPanelMsg = 21020;
+ /// <summary>
+ /// 鏂规偊鐜闈㈡澘 -> 鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddFangyueEnvironmentPanelMsg = 21021;
+ /// <summary>
+ /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddCurtaunPanelMsg = 21022;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
@@ -5604,6 +5811,39 @@
/// 闀滃儚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;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0