From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/R.cs | 1204 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 933 insertions(+), 271 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index b71297d..a3747df
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -316,28 +316,256 @@
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>
+ /// 鎸変綇闈㈡澘妯″紡
+ /// </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>
+ /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽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 DoorLockOffLine = 266;
+ /// <summary>
+ /// 鑾峰彇闊抽噺澶辫触
+ /// </summary>
+ public const int GetVolumeFailed = 267;
+ /// <summary>
+ /// 纭畾瑕佸彇娑堣鎴愬憳鎷ユ湁杩滅▼寮�閿佹潈闄愬悧锛�
+ /// </summary>
+ public const int SureCancelAccessToSubaccount = 268;
+ /// <summary>
+ /// 鏃跺尯
+ /// </summary>
+ public const int CurZoneText0 = 269;
+ public const int CurZoneText1 = 270;
+ public const int CurZoneText2 = 271;
+ public const int CurZoneText3 = 272;
+ public const int CurZoneText4 = 273;
+ public const int CurZoneText5 = 274;
+ public const int CurZoneText6 = 275;
+ public const int CurZoneText7 = 276;
+ public const int CurZoneText8 = 277;
+ public const int CurZoneText9 = 278;
+ public const int CurZoneText10 = 279;
+ public const int CurZoneText11 = 280;
+ public const int CurZoneText12 = 281;
+ public const int WestZoneText1 = 282;
+ public const int WestZoneText2 = 283;
+ public const int WestZoneText3 = 284;
+ public const int WestZoneText4 = 285;
+ public const int WestZoneText5 = 286;
+ public const int WestZoneText6 = 287;
+ public const int WestZoneText7 = 288;
+ public const int WestZoneText8 = 289;
+ public const int WestZoneText9 = 290;
+ public const int WestZoneText10 = 291;
+ public const int WestZoneText11 = 292;
+ public const int WestZoneText12 = 293;
+ /// <summary>
+ /// 鐢熸晥鏃ユ湡涓嶈兘灏忎簬褰撳墠鏃ユ湡
+ /// </summary>
+ public const int ValidTimeNoLessThanCurrentTime = 294;
+ /// <summary>
+ /// 鐢熸晥鏃堕棿涓嶈兘澶т簬澶辨晥鏃堕棿
+ /// </summary>
+ public const int ValidTimeNoMoreThanInValidTime = 295;
+ /// <summary>
+ /// 澶辨晥鏃堕棿涓嶈兘灏忎簬鐢熸晥鏃堕棿
+ /// </summary>
+ public const int InvalidTimeNoLessThanValidTime = 296;
+ /// <summary>
+ /// 澶辨晥鏃堕棿涓嶈兘鐪佺暐
+ /// </summary>
+ public const int InvalidTimeIsEmpty = 297;
+ /// <summary>
+ /// 澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
+ /// </summary>
+ public const int InvalidTimeMoreThan72 = 298;
+ /// <summary>
+ /// 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
+ /// </summary>
+ public const int InvalidTimeLessThan1 = 299;
+ /// <summary>
+ /// 鏂伴
+ /// </summary>
+ public const int FreshAir = 300;
+ /// <summary>
+ /// 闈炵鐞嗗憳涓嶈兘鍦ㄥ父寮�妯″紡涓嬫搷浣�
+ /// </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;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -437,7 +665,7 @@
public readonly static int addtime = 5192;
public readonly static int selectcommontimetype = 5193;
public readonly static int newautomation = 5194;
- public readonly static int editautomation= 5195;
+ public readonly static int editautomation = 5195;
public readonly static int open1 = 5196;
public readonly static int disable = 5197;
public readonly static int selectsavedautomationstate = 5198;
@@ -573,10 +801,10 @@
public readonly static int logictemplate = 5358;
public readonly static int onlight = 5359;
public readonly static int offlight = 5360;
- public readonly static int OnOffSwitch=5361;
+ public readonly static int OnOffSwitch = 5361;
public readonly static int addlinkageevent = 5362;
public readonly static int editlinkageevent = 5363;
- public readonly static int selectunlockingmode=5364;
+ public readonly static int selectunlockingmode = 5364;
public readonly static int lockaddaction = 5365;
public readonly static int linkageevent = 5366;
public readonly static int current = 5367;
@@ -591,6 +819,26 @@
public readonly static int application = 5376;
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;
+ 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;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -604,114 +852,114 @@
- /// <summary>
- /// 鎵嬫満鍙�
- /// </summary>
- public const int PhoneNum = 10100;
- /// <summary>
- /// 閭
- /// </summary>
- public const int Email = 10101;
- /// <summary>
- /// 璇疯緭鍏ユ墜鏈哄彿
- /// </summary>
- public const int PleaseInputPhoneNum = 10102;
- /// <summary>
- /// 璇疯緭鍏ヤ笉灏戜簬6浣嶇殑瀵嗙爜
- /// </summary>
- public const int PleaseInputPWD = 10103;
- /// <summary>
- /// 鐧诲綍
- /// </summary>
- public const int Login = 10104;
- /// <summary>
- /// 楠岃瘉鐮佺櫥褰�
- /// </summary>
- public const int LoginByCode = 10105;
- /// <summary>
- /// 娉ㄥ唽鐢ㄦ埛
- /// </summary>
- public const int Register = 10106;
- /// <summary>
- /// 璇疯緭鍏ラ偖绠�
- /// </summary>
- public const int PleaseInputEmail = 10107;
- /// <summary>
- /// 鎼滅储
- /// </summary>
- public const int Search = 10108;
- /// <summary>
- /// 瀹屾垚
- /// </summary>
- public const int Complete = 10109;
- /// <summary>
- /// 璐﹀彿鐧诲綍
- /// </summary>
- public const int LoginByAccountPWD = 10110;
- /// <summary>
- /// 鑾峰彇楠岃瘉鐮�
- /// </summary>
- public const int SendVerificationCode = 10111;
- /// <summary>
- /// 鍚庨噸鍙�
- /// </summary>
- public const int SendVerificationCodeAgain = 10112;
- /// <summary>
- /// 璇峰啀娆¤緭鍏ュ瘑鐮�
- /// </summary>
- public const int PleaseComfirePWD = 10113;
- /// <summary>
- /// 鍙戦�侀獙璇佺爜鎴愬姛锛岃娉ㄦ剰鏌ユ敹
- /// </summary>
- public const int SendVerificationCodeSuccess = 10114;
- /// <summary>
- /// 纭畾
- /// </summary>
- public const int Confrim = 10115;
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ public const int PhoneNum = 10100;
+ /// <summary>
+ /// 閭
+ /// </summary>
+ public const int Email = 10101;
+ /// <summary>
+ /// 璇疯緭鍏ユ墜鏈哄彿
+ /// </summary>
+ public const int PleaseInputPhoneNum = 10102;
+ /// <summary>
+ /// 璇疯緭鍏ヤ笉灏戜簬6浣嶇殑瀵嗙爜
+ /// </summary>
+ public const int PleaseInputPWD = 10103;
+ /// <summary>
+ /// 鐧诲綍
+ /// </summary>
+ public const int Login = 10104;
+ /// <summary>
+ /// 楠岃瘉鐮佺櫥褰�
+ /// </summary>
+ public const int LoginByCode = 10105;
+ /// <summary>
+ /// 娉ㄥ唽鐢ㄦ埛
+ /// </summary>
+ public const int Register = 10106;
+ /// <summary>
+ /// 璇疯緭鍏ラ偖绠�
+ /// </summary>
+ public const int PleaseInputEmail = 10107;
+ /// <summary>
+ /// 鎼滅储
+ /// </summary>
+ public const int Search = 10108;
+ /// <summary>
+ /// 瀹屾垚
+ /// </summary>
+ public const int Complete = 10109;
+ /// <summary>
+ /// 璐﹀彿鐧诲綍
+ /// </summary>
+ public const int LoginByAccountPWD = 10110;
+ /// <summary>
+ /// 鑾峰彇楠岃瘉鐮�
+ /// </summary>
+ public const int SendVerificationCode = 10111;
+ /// <summary>
+ /// 鍚庨噸鍙�
+ /// </summary>
+ public const int SendVerificationCodeAgain = 10112;
+ /// <summary>
+ /// 璇峰啀娆¤緭鍏ュ瘑鐮�
+ /// </summary>
+ public const int PleaseComfirePWD = 10113;
+ /// <summary>
+ /// 鍙戦�侀獙璇佺爜鎴愬姛锛岃娉ㄦ剰鏌ユ敹
+ /// </summary>
+ public const int SendVerificationCodeSuccess = 10114;
+ /// <summary>
+ /// 纭畾
+ /// </summary>
+ public const int Confrim = 10115;
/// <summary>
/// 璇ョ敤鎴峰凡瀛樺湪锛屽彲鐩存帴鐧诲綍
/// </summary>
public const int AccountHasBeenRegistered = 10116;
- /// <summary>
- /// 鎻愪緵鐨勫弬鏁伴敊璇�
- /// </summary>
- public const int PARAMETEROREMPTY = 10117;
+ /// <summary>
+ /// 鎻愪緵鐨勫弬鏁伴敊璇�
+ /// </summary>
+ public const int PARAMETEROREMPTY = 10117;
/// <summary>
/// 纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
/// </summary>
public const int TwoPasswordInconsistency = 10118;
- /// <summary>
- /// 楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
- /// </summary>
- public const int VALIDCODEANDPHONENOEQUAL = 10119;
- /// <summary>
- /// 璇锋眰鏈嶅姟鍣ㄥけ璐�
- /// </summary>
- public const int RequestServerFailed = 10120;
- /// <summary>
- /// 鎭枩娉ㄥ唽鎴愬姛锛�
- /// </summary>
- public const int RegisterSuccessTip = 10121;
- /// <summary>
- /// 鍗冲皢鑷姩鐧诲綍
- /// </summary>
- public const int WillAutoLogin = 10122;
- /// <summary>
- /// 蹇樿瀵嗙爜
- /// </summary>
- public const int ForgotPWD = 10123;
- /// <summary>
- /// 纭閲嶇疆
- /// </summary>
- public const int ComfirmReset = 10124;
- /// <summary>
- /// 淇敼鎴愬姛
- /// </summary>
- public const int ResetSuccess = 10125;
- /// <summary>
- /// 浣犵殑瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍
- /// </summary>
- public const int ResetScucessPleaseLogin = 10126;
+ /// <summary>
+ /// 楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
+ /// </summary>
+ public const int VALIDCODEANDPHONENOEQUAL = 10119;
+ /// <summary>
+ /// 璇锋眰鏈嶅姟鍣ㄥけ璐�
+ /// </summary>
+ public const int RequestServerFailed = 10120;
+ /// <summary>
+ /// 鎭枩娉ㄥ唽鎴愬姛锛�
+ /// </summary>
+ public const int RegisterSuccessTip = 10121;
+ /// <summary>
+ /// 鍗冲皢鑷姩鐧诲綍
+ /// </summary>
+ public const int WillAutoLogin = 10122;
+ /// <summary>
+ /// 蹇樿瀵嗙爜
+ /// </summary>
+ public const int ForgotPWD = 10123;
+ /// <summary>
+ /// 纭閲嶇疆
+ /// </summary>
+ public const int ComfirmReset = 10124;
+ /// <summary>
+ /// 淇敼鎴愬姛
+ /// </summary>
+ public const int ResetSuccess = 10125;
+ /// <summary>
+ /// 浣犵殑瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍
+ /// </summary>
+ public const int ResetScucessPleaseLogin = 10126;
/// <summary>
/// 璇烽�夋嫨鍖哄彿
/// </summary>
@@ -882,28 +1130,28 @@
/// 鍔熻兘
/// </summary>
public const int Function = 11000;
- /// <summary>
- /// 鍦烘櫙
- /// </summary>
- public const int Scence = 11001;
- /// <summary>
- /// 鑷姩鍖�
- /// </summary>
- public const int Automation = 11002;
+ /// <summary>
+ /// 鍦烘櫙
+ /// </summary>
+ public const int Scence = 11001;
+ /// <summary>
+ /// 鑷姩鍖�
+ /// </summary>
+ public const int Automation = 11002;
- /// <summary>
- /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�
- /// </summary>
- public const int NoFunction = 11010;
- /// <summary>
- /// 缂栬緫
- /// </summary>
- public const int Edit = 11011;
- /// <summary>
- /// 璁剧疆鍔熻兘
- /// </summary>
- public const int FunctionSetting = 11012;
+ /// <summary>
+ /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
+ /// </summary>
+ public const int NoFunction = 11010;
+ /// <summary>
+ /// 缂栬緫
+ /// </summary>
+ public const int Edit = 11011;
+ /// <summary>
+ /// 鍔熻兘璁剧疆
+ /// </summary>
+ public const int FunctionSetting = 11012;
/// <summary>
/// 淇℃伅缂栬緫
/// </summary>
@@ -917,9 +1165,9 @@
/// </summary>
public const int BelongZone = 11015;
/// <summary>
- /// 鎵�灞炴ā鍧�
+ /// 鎵�灞炶澶�
/// </summary>
- public const int BelongModel = 11016;
+ public const int BelongDevice = 11016;
/// <summary>
/// 鏈煡
/// </summary>
@@ -1000,6 +1248,11 @@
/// 娣诲姞寤舵椂
/// </summary>
public const int AddDelayTime = 11036;
+ /// <summary>
+ /// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
+ /// </summary>
+ public const int AC_Model_None = 11037;
+
#region 璁惧绫诲瀷
/// <summary>
@@ -1098,88 +1351,88 @@
/// </summary>
public const int RoomList = 13100;
- /// <summary>
- /// 閫夋嫨妤煎眰
- /// </summary>
- public const int SelectFloor = 13101;
- /// <summary>
- /// 閫夋嫨浣忓畢
- /// </summary>
- public const int ChangeHome = 13102;
- /// <summary>
- /// 鏂扮敤鎴风櫥褰曪紝璇峰厛缁戝畾缃戝叧
- /// </summary>
- public const int NewAccountNeedBingGW = 13103;
- /// <summary>
- /// 娣诲姞鏅鸿兘缃戝叧
- /// </summary>
- public const int AddSmartGW = 13104;
- /// <summary>
- /// 缂栬緫鎴块棿
- /// </summary>
- public const int EditRoom = 13105;
- /// <summary>
- /// 鎴块棿鍚嶇О
- /// </summary>
- public const int RoomName = 13106;
- /// <summary>
- /// 鎵�灞炴ゼ灞�
- /// </summary>
- public const int BelongFloor = 13107;
- /// <summary>
- /// 娓╁害
- /// </summary>
- public const int Temperature = 13108;
- /// <summary>
- /// 婀垮害
- /// </summary>
- public const int Humidity = 13109;
- /// <summary>
- /// 褰撳墠
- /// </summary>
- public const int Current = 13110;
- /// <summary>
- /// 寮�
- /// </summary>
- public const int Open = 13111;
- /// <summary>
- /// 鍏抽棴
- /// </summary>
- public const int Close = 13112;
- /// <summary>
- /// 涓嶅紑鍚�
- /// </summary>
- public const int NotOpen = 13113;
- /// <summary>
- /// 绉�
- /// </summary>
- public const int Second = 13114;
- /// <summary>
- /// 鍒嗛挓
- /// </summary>
- public const int Minute = 13115;
- /// <summary>
- /// 灏忔椂
- /// </summary>
- public const int Hour = 13116;
- /// <summary>
- /// 鏈垎閰�
- /// </summary>
- public const int Unallocated = 13117;
- /// <summary>
- /// 鍏ㄩ��
- /// </summary>
- public const int AllSelect = 13118;
- /// <summary>
- /// 娣诲姞鍒�
- /// </summary>
- public const int AddTo = 13119;
+ /// <summary>
+ /// 閫夋嫨妤煎眰
+ /// </summary>
+ public const int SelectFloor = 13101;
+ /// <summary>
+ /// 閫夋嫨浣忓畢
+ /// </summary>
+ public const int ChangeHome = 13102;
+ /// <summary>
+ /// 鏂扮敤鎴风櫥褰曪紝璇峰厛缁戝畾缃戝叧
+ /// </summary>
+ public const int NewAccountNeedBingGW = 13103;
+ /// <summary>
+ /// 娣诲姞鏅鸿兘缃戝叧
+ /// </summary>
+ public const int AddSmartGW = 13104;
+ /// <summary>
+ /// 缂栬緫鎴块棿
+ /// </summary>
+ public const int EditRoom = 13105;
+ /// <summary>
+ /// 鎴块棿鍚嶇О
+ /// </summary>
+ public const int RoomName = 13106;
+ /// <summary>
+ /// 鎵�灞炴ゼ灞�
+ /// </summary>
+ public const int BelongFloor = 13107;
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const int Temperature = 13108;
+ /// <summary>
+ /// 婀垮害
+ /// </summary>
+ public const int Humidity = 13109;
+ /// <summary>
+ /// 褰撳墠
+ /// </summary>
+ public const int Current = 13110;
+ /// <summary>
+ /// 寮�
+ /// </summary>
+ public const int Open = 13111;
+ /// <summary>
+ /// 鍏抽棴
+ /// </summary>
+ public const int Close = 13112;
+ /// <summary>
+ /// 涓嶅紑鍚�
+ /// </summary>
+ public const int NotOpen = 13113;
+ /// <summary>
+ /// 绉�
+ /// </summary>
+ public const int Second = 13114;
+ /// <summary>
+ /// 鍒嗛挓
+ /// </summary>
+ public const int Minute = 13115;
+ /// <summary>
+ /// 灏忔椂
+ /// </summary>
+ public const int Hour = 13116;
+ /// <summary>
+ /// 鏈垎閰�
+ /// </summary>
+ public const int Unallocated = 13117;
+ /// <summary>
+ /// 鍏ㄩ��
+ /// </summary>
+ public const int AllSelect = 13118;
+ /// <summary>
+ /// 娣诲姞鍒�
+ /// </summary>
+ public const int AddTo = 13119;
/// <summary>
/// 璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
/// </summary>
public const int TheRoomIsSharedNotAllowedToOperate = 13120;
/// <summary>
- /// 杩樻病閫夋嫨鎴块棿锛岃鍏堥�夋嫨
+ /// 杩樻病閫夋嫨鍖哄煙锛岃鍏堥�夋嫨
/// </summary>
public const int NotSelectZone = 13121;
/// <summary>
@@ -1300,7 +1553,7 @@
/// <summary>
/// 閫夋嫨鎽嗛
/// </summary>
- public const int SelectSwing=13500;
+ public const int SelectSwing = 13500;
/// <summary>
/// 鑷姩
/// </summary>
@@ -1356,15 +1609,15 @@
#endregion
-
- /// <summary>
- /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
- /// </summary>
- public const int PswLengthMsg = 15000;
+
+ /// <summary>
+ /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+ /// </summary>
+ public const int PswLengthMsg = 15000;
/// <summary>
/// 1涓皬鍐欏瓧姣�
/// </summary>
@@ -2162,9 +2415,9 @@
/// </summary>
public const int uBackup = 15225;
/// <summary>
- /// 璇疯緭鍏ュ娉ㄥ悕绉�
+ /// 璇疯緭鍏ュ浠藉悕绉�
/// </summary>
- public const int uPleaseInpuBackup = 15226;
+ public const int uPleaseInpuBackupName = 15226;
/// <summary>
/// 鎭㈠鏂囦欢鎴愬姛
/// </summary>
@@ -3168,7 +3421,7 @@
/// <summary>
/// 鍗忚皟鍣�
/// </summary>
- public const int uCoordinator= 15514;
+ public const int uCoordinator = 15514;
/// <summary>
/// 铏氭嫙椹卞姩
/// </summary>
@@ -3838,15 +4091,15 @@
/// </summary>
public const int uDoorLockAlarmMsg5 = 15699;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅6锛氬父寮�妯″紡寮�鍚�
+ /// 闂ㄩ攣鎶ヨ淇℃伅6锛氬父寮�妯″紡寮�鍚�(闂ㄩ攣瑙﹀彂)
/// </summary>
public const int uDoorLockAlarmMsg6 = 15700;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅7锛氬父寮�妯″紡缁撴潫
+ /// 闂ㄩ攣鎶ヨ淇℃伅7锛氬父寮�妯″紡缁撴潫(闂ㄩ攣瑙﹀彂)
/// </summary>
public const int uDoorLockAlarmMsg7 = 15701;
/// <summary>
- /// 闂ㄩ攣鎶ヨ淇℃伅8锛氶棬閾冭Е鍙�
+ /// 闂ㄩ攣鎶ヨ淇℃伅8锛氭湁浜鸿闂�
/// </summary>
public const int uDoorLockAlarmMsg8 = 15702;
/// <summary>
@@ -4538,7 +4791,7 @@
/// </summary>
public const int uGetPictrueFromAlbum = 15874;
/// <summary>
- /// 鍑虹幇鏈煡閿欒
+ /// 鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
/// </summary>
public const int uUnKnownError = 15875;
/// <summary>
@@ -4660,7 +4913,7 @@
/// <summary>
/// 璺宠浆鍒扮Щ鍔ㄨ澶�
/// </summary>
- public const int uJumpToMobileDevice= 15905;
+ public const int uJumpToMobileDevice = 15905;
/// <summary>
/// WLAN璁剧疆杩炴帴瀹跺涵WiFi
/// </summary>
@@ -4722,7 +4975,7 @@
/// </summary>
public const int uSubmit = 15922;
/// <summary>
- /// 鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+ /// 鎮ㄧ殑鍙嶉宸叉垚鍔熸彁浜�
/// </summary>
public const int uSubmitSuccessMsg = 15923;
/// <summary>
@@ -5273,6 +5526,230 @@
/// 鍔炲叕瀹�
/// </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;
+ /// <summary>
+ /// 瀹夎浣嶇疆
+ /// </summary>
+ public const int uInstallationLocation = 16075;
+ /// <summary>
+ /// 鎵�灞炰綇瀹�
+ /// </summary>
+ public const int uBelongResidence = 16076;
+ /// <summary>
+ /// 涓嶅垎閰�
+ /// </summary>
+ public const int uUndistributed = 16077;
+ /// <summary>
+ /// 瀹ゅ唴鏈�
+ /// </summary>
+ public const int uIndoorUnit = 16078;
+ /// <summary>
+ /// 鎸夐敭
+ /// </summary>
+ public const int uPanelButton = 16079;
+ /// <summary>
+ /// 鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
+ /// </summary>
+ public const int uShardResidenceHadDeletePleaseTakeToAdmin = 16080;
+ /// <summary>
+ /// 鑾峰彇鎵ц鐩爣澶辫触
+ /// </summary>
+ public const int uGetAdjustTargetFail = 16081;
+ /// <summary>
+ /// 娌℃湁鍙互娣诲姞鐨勫満鏅�
+ /// </summary>
+ public const int uNotHadAddScene = 16082;
+ /// <summary>
+ /// 璇锋坊鍔犳墽琛岀洰鏍�
+ /// </summary>
+ public const int uPleaseAddAdjustTarget = 16083;
+ /// <summary>
+ /// 娣诲姞鎵ц鐩爣澶辫触
+ /// </summary>
+ public const int uAddAdjustTargetFail = 16084;
+ /// <summary>
+ /// 涓埆鎵ц鐩爣娣诲姞澶辫触
+ /// </summary>
+ public const int uSomeAdjustTargetAddFail = 16085;
+ /// <summary>
+ /// 鍒濆鍖栨墽琛岀洰鏍囧け璐�
+ /// </summary>
+ public const int uInitAdjustTargetFail = 16086;
+ /// <summary>
+ /// 淇敼鍦烘櫙鍚嶇О澶辫触
+ /// </summary>
+ public const int uEditorSceneNameFail = 16087;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅9锛氬父寮�妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+ /// </summary>
+ public const int uDoorLockAlarmMsg9 = 16088;
+ /// <summary>
+ /// 闂ㄩ攣鎶ヨ淇℃伅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寮�濮嬧槄鈽呪槄鈽�
@@ -5484,23 +5961,47 @@
/// 娓╂箍搴︿紶鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭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;
+ /// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorCeilingGasMsg = 21023;
- //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
- /// 闀滃儚ID涓�1305(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱揣鎬ユ寜閽�
+ /// 闀滃儚ID涓�1305(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱揣鎬ユ寜閽�
/// </summary>
public const int uDeviceModelId1305 = 30000;
/// <summary>
- /// 闀滃儚ID涓�1300(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱噧姘斾紶鎰熷櫒
+ /// 闀滃儚ID涓�1300(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱噧姘斾紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1300 = 30001;
/// <summary>
- /// 闀滃儚ID涓�1302(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱儫闆句紶鎰熷櫒
+ /// 闀滃儚ID涓�1302(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱儫闆句紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1302 = 30002;
/// <summary>
- /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按娴镐紶鎰熷櫒
+ /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭按娴镐紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1304 = 30003;
/// <summary>
@@ -5508,101 +6009,145 @@
/// </summary>
public const int uKeyfob = 30004;
/// <summary>
- /// 闀滃儚ID涓�1301(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氶棬绐椾紶鎰熷櫒
+ /// 闀滃儚ID涓�1301(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氶棬绐椾紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1301 = 30005;
/// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛氭櫤鑳界┖寮�
+ /// 闀滃儚ID涓�4100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭櫤鑳界┖寮�
/// </summary>
public const int uDeviceModelId4100 = 30006;
/// <summary>
- /// 闀滃儚ID涓�100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
+ /// 闀滃儚ID涓�100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
/// </summary>
public const int uDeviceModelId100 = 30007;
/// <summary>
- /// 闀滃儚ID涓�200鐨勮澶囩殑榛樿鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId200 = 30008;
/// <summary>
- /// 闀滃儚ID涓�1200鐨勮澶囩殑榛樿鍚嶅瓧锛�220Pir浼犳劅鍣�
+ /// 闀滃儚ID涓�1200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�220Pir浼犳劅鍣�
/// </summary>
public const int uDeviceModelId1200 = 30009;
/// <summary>
- /// 闀滃儚ID涓�1鐨勮澶囩殑榛樿鍚嶅瓧锛�1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
+ /// 闀滃儚ID涓�1鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
/// </summary>
public const int uDeviceModelId1 = 30010;
/// <summary>
- /// 闀滃儚ID涓�201鐨勮澶囩殑榛樿鍚嶅瓧锛�3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId201 = 30011;
/// <summary>
- /// 闀滃儚ID涓�202鐨勮澶囩殑榛樿鍚嶅瓧锛�2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�202鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId202 = 30012;
/// <summary>
- /// 闀滃儚ID涓�2300鐨勮澶囩殑榛樿鍚嶅瓧锛�3璺户鐢靛櫒灏忔ā鍧�
+ /// 闀滃儚ID涓�2300鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3璺户鐢靛櫒灏忔ā鍧�
/// </summary>
public const int uDeviceModelId2300 = 30013;
/// <summary>
- /// 闀滃儚ID涓�6鐨勮澶囩殑榛樿鍚嶅瓧锛�1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
+ /// 闀滃儚ID涓�6鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
/// </summary>
public const int uDeviceModelId6 = 30014;
/// <summary>
- /// 闀滃儚ID涓�0鐨勮澶囩殑榛樿鍚嶅瓧锛氳皟璇曡澶�
+ /// 闀滃儚ID涓�0鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳皟璇曡澶�
/// </summary>
public const int uDeviceModelId0 = 30015;
/// <summary>
- /// 闀滃儚ID涓�101鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鏅鸿兘绠＄姸鐢垫満
+ /// 闀滃儚ID涓�101鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘绠＄姸鐢垫満
/// </summary>
public const int uDeviceModelId101 = 30016;
/// <summary>
- /// 闀滃儚ID涓�3900鐨勮澶囩殑榛樿鍚嶅瓧锛氫腑缁у櫒
+ /// 闀滃儚ID涓�3900鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氫腑缁у櫒
/// </summary>
public const int uDeviceModelId3900 = 30017;
/// <summary>
- /// 闀滃儚ID涓�203鐨勮澶囩殑榛樿鍚嶅瓧锛�12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�203鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId203 = 30018;
/// <summary>
- /// 闀滃儚ID涓�210鐨勮澶囩殑榛樿鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(鍙甫鐢垫簮搴曞骇)
+ /// 闀滃儚ID涓�210鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(鍙甫鐢垫簮搴曞骇)
/// </summary>
public const int uDeviceModelId210 = 30019;
/// <summary>
- /// 闀滃儚ID涓�1303(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱孩澶栦紶鎰熷櫒
+ /// 闀滃儚ID涓�1303(鏆傚畾)鐨勫畼鏂圭殑榛樿鍚嶅瓧锛氱孩澶栦紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1303 = 30020;
/// <summary>
- /// 闀滃儚ID涓�2500鐨勮澶囩殑榛樿鍚嶅瓧锛�1璺皟鍏夊櫒灏忔ā鍧�
+ /// 闀滃儚ID涓�2500鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1璺皟鍏夊櫒灏忔ā鍧�
/// </summary>
public const int uDeviceModelId2500 = 30021;
/// <summary>
- /// 闀滃儚ID涓�4200鐨勮澶囩殑榛樿鍚嶅瓧锛歾igbee杞琤uspro鍗忚杞崲鍣�
+ /// 闀滃儚ID涓�4200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞琤uspro鍗忚杞崲鍣�
/// </summary>
public const int uDeviceModelId4200 = 30022;
/// <summary>
- /// 闀滃儚ID涓�4201鐨勮澶囩殑榛樿鍚嶅瓧锛歾igbee杞�485鍗忚杞崲鍣�
+ /// 闀滃儚ID涓�4201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞�485鍗忚杞崲鍣�
/// </summary>
public const int uDeviceModelId4201 = 30023;
/// <summary>
- /// 闀滃儚ID涓�3600鐨勮澶囩殑榛樿鍚嶅瓧锛歾igbee绌鸿皟缃戝叧妯″潡
+ /// 闀滃儚ID涓�3600鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee绌鸿皟缃戝叧妯″潡
/// </summary>
public const int uDeviceModelId3600 = 30024;
/// <summary>
- /// 闀滃儚ID涓�2800鐨勮澶囩殑榛樿鍚嶅瓧锛欻06C
+ /// 闀滃儚ID涓�2800鐨勮澶囩殑瀹樻柟鍚嶅瓧锛欻06C
/// </summary>
public const int uDeviceModelId2800 = 30025;
/// <summary>
- /// 闀滃儚ID涓�220鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
+ /// 闀滃儚ID涓�220鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
/// </summary>
public const int uDeviceModelId220 = 30026;
/// <summary>
- /// 闀滃儚ID涓�221鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
+ /// 闀滃儚ID涓�221鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
/// </summary>
public const int uDeviceModelId221 = 30027;
/// <summary>
- /// 闀滃儚ID涓�222鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
+ /// 闀滃儚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;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5664,18 +6209,135 @@
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏�
/// </summary>
- public const int uDeviceBelongId13 = 15665;
+ public const int uDeviceBelongId13 = 40014;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�14鐨勭炕璇戝悕瀛楋細鎻掑骇
/// </summary>
- public const int uDeviceBelongId14 = 15666;
+ public const int uDeviceBelongId14 = 40015;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜
/// </summary>
- public const int uDeviceBelongId15 = 15071;
+ public const int uDeviceBelongId15 = 40016;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
/// </summary>
- public const int uDeviceBelongId16 = 40014;
+ public const int uDeviceBelongId16 = 40017;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�2310鐨勭炕璇戝悕瀛楋細鏂伴
+ /// </summary>
+ public const int uDeviceBelongId2310 = 40018;
+
+ //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
+ //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
+
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭ｉ噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
+ /// <summary>
+ /// 2鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName1 = 70000;
+ /// <summary>
+ /// 3鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName2 = 70001;
+ /// <summary>
+ /// 4鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName3 = 70002;
+ /// <summary>
+ /// 鏂规偊鍗曞紑鍙屾帶闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName4 = 70003;
+ /// <summary>
+ /// 鏂规偊鍙屽紑鍥涙帶闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName5 = 70004;
+ /// <summary>
+ /// 鏂规偊鍥涘紑鍏帶闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName6 = 70005;
+ /// <summary>
+ /// 鏂规偊鏂伴灏忔ā鍧�
+ /// </summary>
+ public const int uDeviceDirectionName7 = 70006;
+ /// <summary>
+ /// 鏂规偊鏂伴闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName8 = 70007;
+ /// <summary>
+ /// 鏂规偊鐜闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName9 = 70008;
+ /// <summary>
+ /// 绐楀笜闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName10 = 70009;
+ /// <summary>
+ /// 3璺户鐢靛櫒
+ /// </summary>
+ public const int uDeviceDirectionName11 = 70010;
+ /// <summary>
+ /// 1璺皟鍏夊櫒
+ /// </summary>
+ public const int uDeviceDirectionName12 = 70011;
+ /// <summary>
+ /// 绐楀笜鐢垫満
+ /// </summary>
+ public const int uDeviceDirectionName13 = 70012;
+ /// <summary>
+ /// 鍗峰笜鐢垫満
+ /// </summary>
+ public const int uDeviceDirectionName14 = 70013;
+ /// <summary>
+ /// 绌鸿皟缃戝叧
+ /// </summary>
+ public const int uDeviceDirectionName15 = 70014;
+ /// <summary>
+ /// 闂ㄩ攣
+ /// </summary>
+ public const int uDeviceDirectionName16 = 70015;
+ /// <summary>
+ /// PIR浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName17 = 70016;
+ /// <summary>
+ /// 绾㈠浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName18 = 70017;
+ /// <summary>
+ /// 鐕冩皵浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName19 = 70018;
+ /// <summary>
+ /// 鐑熼浘浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName20 = 70019;
+ /// <summary>
+ /// 姘存蹈浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName21 = 70020;
+ /// <summary>
+ /// 闂ㄧ獥浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName22 = 70021;
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒
+ /// </summary>
+ public const int uDeviceDirectionName23 = 70022;
+ /// <summary>
+ /// 涓户鍣�
+ /// </summary>
+ public const int uDeviceDirectionName24 = 70023;
+ /// <summary>
+ /// 鏅鸿兘绌哄紑
+ /// </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