From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/Shared/R.cs | 2484 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 1,838 insertions(+), 646 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 93957ab..c1908dd
--- 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>
@@ -350,7 +350,7 @@
         /// </summary>
         public const int AddFreshAirModulPanelMsg = 239;
         /// <summary>
-        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
+        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
         /// </summary>
         public const int SetDoorLockNomallyOpen = 241;
         /// <summary>
@@ -539,13 +539,381 @@
         /// </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;
+        /// <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;
+        /// <summary>
+        /// 鏈�澶氬彲娣诲姞{0}涓�
+        /// </summary>
+        public const int AddMoreTip = 328;
+        /// <summary>
+        /// 缁戝畾
+        /// </summary>
+        public const int Bind = 329;
+        /// <summary>
+        /// 330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜缁戝畾
+        /// </summary>
+        public readonly static int CanSelectDimmer = 330;
+        /// <summary>
+        /// 璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏夌粦瀹�
+        /// </summary>
+        public readonly static int CanSelectRelay = 331;
+        /// <summary>
+        /// 绌鸿皟鐩爣
+        /// </summary>
+        public const int AcTargets = 332;
+        /// <summary>
+        /// 涓嶇粦瀹氫换浣曠洰鏍�
+        /// </summary>
+        public const int BindEmptyTargets = 333;
+        /// <summary>
+        /// /鐫$湢鏃堕棿
+        /// </summary>
+        public const int SleepTime = 334;
+        /// <summary>
+        /// 璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞¢敊涔�
+        /// </summary>
+        public const int UpdateBindList = 335;
+        /// <summary>
+        /// 鍚屾
+        /// </summary>
+        public const int Synchronization = 336;
+        /// <summary>
+        /// 鍚屾澶辫触
+        /// </summary>
+        public const int SynchronizationFailed = 337;
+        /// <summary>
+        /// 鏁版嵁鏍℃
+        /// </summary>
+        public const int DataCorrection = 338;
+        /// <summary>
+        ///  339=鐭娓╁害澶辫触
+        /// </summary>
+        public const int DataCorrectionFailed = 339;
+        /// <summary>
+        ///  340=鐭闈㈡澘鍐呯疆鐨勬俯搴︽垨婀垮害浼犳劅鍣ㄨ鏁�
+        /// </summary>
+        public const int DataCorrectionTip = 340;
+        /// <summary>
+        ///  341=璇疯緭鍏ユ纭殑鏁板��
+        /// </summary>
+        public const int NumTip = 341;
+        /// <summary>
+        ///  342=璇疯緭鍏ユ纭殑娓╁害鍊�
+        /// </summary>
+        public const int TNumTip = 342;
+        /// <summary>
+        ///  343=璇疯緭鍏ユ纭殑婀垮害鍊�
+        /// </summary>
+        public const int HNumTip = 343;
+        /// <summary>
+        ///  344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
+        /// </summary>
+        public const int BindRemarkTip1 = 344;
+        /// <summary>
+        ///  345=鐩爣鍚嶇О澶暱
+        /// </summary>
+        public const int BindRemarkTip2 = 345;
+        /// <summary>
+        ///  346=鐭ラ亾浜�
+        /// </summary>
+        public const int Iknown = 346;
+        /// <summary>
+        /// 鏅捐。鏋�
+        /// </summary>
+        public const int Airer = 347;
+        /// <summary>
+        /// 鐜
+        /// </summary>
+        public const int Envoronment = 348;
+        /// <summary>
+        /// 钃濊壊鎸囩ず鐏揩閫熼棯鐑伮犅犅犅犅犅�
+        /// </summary>
+        public const int uSignalIcon349 = 349;
+        /// <summary>
+        /// 鍚屾椂闀挎寜锛寋0}鈥滀笂琛屸�濆拰鈥滀笅琛屸�濋敭5-10绉�
+        /// </summary>
+        public const int uSignalIcon350 = 350;
+        /// <summary>
+        /// 鏅捐。鏋朵笂鐢靛悗锛屽彂鍑鸿渹楦e0鏃讹紝{0}鍚屾椂鎸夆�滀笂琛屸�濆拰鈥滀笅琛屸�濋敭5-10绉�
+        /// </summary>
+        public const int uSignalIcon351 = 351;
+        /// <summary>
+        /// 缁胯壊鎸囩ず鐏揩閫熼棯鐑伮犅犅犅犅犅�
+        /// </summary>
+        public const int uSignalIcon352 = 352;
+        /// <summary>
+        /// 闀挎寜5绉抺0}(鎸夐敭)
+        /// </summary>
+        public const int uSignalIcon353 = 353;
+        /// <summary>
+        ///闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uSignalIcon354 = 354;
+
+        public const int AirerStop = 355;
+        public const int AirerDown = 356;
+        public const int AirerDry = 357;
+        public const int AirerWind = 358;
+        public const int AirerDisinfect = 359;
+        public const int AirerLight = 360;
+        public const int AirerUp = 361;
+        public const int AddDoorLockCalmFingerprint = 362;
+        public const int AddDoorLockFaceID = 363;
+        public const int CalmFingerprintUnlock = 364;
+        public const int FaceIDUnlock = 365;
+        /// <summary>
+        /// 璇锋瀵归棬閿佹憚鍍忓ご杩涜
+        /// </summary>
+        public static readonly int EntryFaceIDTip1 = 366;
+        /// <summary>
+        /// 浜鸿劯鎵弿褰曞叆寮�閿佹柟寮�
+        /// </summary>
+        public static readonly int EntryFaceIDTip2 = 367;
+        /// <summary>
+        /// 璇锋瀵归棬閿佹憚鍍忓ご杩涜鎵弿
+        /// </summary>
+        public static readonly int EntryFaceIDTip3 = 368;
+        /// <summary>
+        /// 褰曞叆寮�閿佹柟寮�
+        /// </summary>
+        public static readonly int EntryFaceIDTip4 = 369;
+        /// <summary>
+        /// 褰曞叆闈欒剦鎸囩汗
+        /// </summary>
+        public static readonly int EntryCalmFingerprint = 370;
+        /// <summary>
+        /// 褰曞叆浜鸿劯璇嗗埆鎴愬姛
+        /// </summary>
+        public static readonly int EntryFaceIDSuccess = 371;
+        /// <summary>
+        /// 褰曞叆闈欒剦鎸囩汗鎴愬姛
+        /// </summary>
+        public static readonly int EntryCalmFingerprintSuccess = 372;
+        /// <summary>
+        /// 浜鸿劯璇嗗埆
+        /// </summary>
+        public static readonly int FaceIDRemark = 373;
+        /// <summary>
+        /// 闈欒剦绾�
+        /// </summary>
+        public static readonly int CalmFingerprintRemark = 374;
+        /// <summary>
+        /// 浜鸿劯璇嗗埆
+        /// </summary>
+        public static readonly int FaceIDMark = 375;
+        /// <summary>
+        /// 闈欒剦绾�
+        /// </summary>
+        public static readonly int CalmFingerprintMark = 376;
+        /// <summary>
+        /// 1.闀挎寜{0}"鐓ф槑閿��5绉�
+        /// </summary>
+        public static readonly int uSignalIcon377 = 377;
+        /// <summary>
+        /// 2.鍐嶆寜{0}涓�涓�"涓婂崌閿��
+        /// </summary>
+        public static readonly int uSignalIcon378 = 378;
+        /// <summary>
+        /// 閬ユ帶鍣ㄦ甯哥殑鐘舵�佷笅锛岄暱鎸�"鐓ф槑閿��5绉掞紝{0}鍐嶆寜涓�涓嬧�濅笂鍗囬敭鈥滐紝铚傞福鍣ㄥ揩鍝�3澹帮紝钃濊壊閰嶇綉{0}鎸囩ず鐏揩闂紝杩涘叆閰嶇綉妯″紡銆�
+        /// </summary>
+        public static readonly int uSignalIcon379 = 379;
+        /// <summary>
+        /// 鐑樺共鏃堕棿
+        /// </summary>
+        public static readonly int AirerDryTime = 380;
+        /// <summary>
+        /// 椋庡共鏃堕棿
+        /// </summary>
+        public static readonly int AirerWindTime = 381;
+        /// <summary>
+        /// 娑堟瘨鏃堕棿
+        /// </summary>
+        public static readonly int AirerDisinfectTime = 382;
+        /// <summary>
+        /// 榛樿
+        /// </summary>
+        public static readonly int AirerDefault = 383;
+        /// <summary>
+        /// 灏忔椂
+        /// </summary>
+        public static readonly int AirerHour = 384;
+        /// <summary>
+        /// 鍒嗛挓
+        /// </summary>
+        public static readonly int AirerMin = 385;
+        /// <summary>
+        /// 鏅捐。
+        /// </summary>
+        public const int AirerFun = 386;
+        /// <summary>
+        /// 璁剧疆鏅捐。鏋剁儤骞叉椂闂村け璐�
+        /// </summary>
+        public const int AirerDryTimeFailed = 387;
+        /// <summary>
+        ///璁剧疆鏅捐。鏋堕骞叉椂闂村け璐�
+        /// </summary>
+        public const int AirerWindTimeFailed = 388;
+        /// <summary>
+        /// 璁剧疆鏅捐。鏋舵秷姣掓椂闂村け璐�
+        /// </summary>
+        public const int AirerDisinfectTimeFailed = 389;
+        /// <summary>
+        /// PM 2.5浼犳劅鍣�
+        /// </summary>
+        public const int Pm2P5Sensor = 390;
+        /// <summary>
+        /// CO2浼犳劅鍣�
+        /// </summary>
+        public const int CO2Sensor = 391;
+        /// <summary>
+        /// 璁剧疆LED鐏�
+        /// </summary>
+        public const int SetAirQualitySensorLight = 392;
+        /// <summary>
+        /// 鏌ョ湅鍘嗗彶璁板綍
+        /// </summary>
+        public const int CheckAirQualitySensorHistory = 393;
+        /// <summary>
+        /// 璁惧LED鐏�
+        /// </summary>
+        public const int Pollution = 394;
+        /// <summary>
+        /// LED璁剧疆
+        /// </summary>
+        public const int LEDSet = 395;
+        /// <summary>
+        /// 璁惧LED鐏�
+        /// </summary>
+        public const int DeviceLED = 396;
+        /// <summary>
+        /// 璁剧疆鏃堕棿
+        /// </summary>
+        public const int LEDSetTime = 397;
+        /// <summary>
+        /// 涓婂崍
+        /// </summary>
+        public const int Morning = 398;
+        /// <summary>
+        /// 涓嬪崍
+        /// </summary>
+        public const int Afternoon = 399;
+        /// <summary>
+        /// 鑾峰彇鍒楄〃鏁版嵁閮ㄥ垎涓㈠け锛岃鍒锋柊閲嶆柊鑾峰彇
+        /// </summary>
+        public const int GetLedTimeLost = 400;
+        /// <summary>
+        /// LED鐏叧闂�
+        /// </summary>
+        public const int LedClose = 401;
+        /// <summary>
+        /// 璇疯缃紑濮嬫椂闂�
+        /// </summary>
+        public const int StartTimeEmpty = 402;
+        /// <summary>
+        /// 璇疯缃紑缁撴潫鏃堕棿
+        /// </summary>
+        public const int EndTimeEmpty = 403;
+        /// <summary>
+        /// 鏈�澶氬彲璁剧疆5鏉″け鏁堟椂闂存
+        /// </summary>
+        public const int LedBindFull = 404;
+        /// <summary>
+        /// 寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�
+        /// </summary>
+        public const int LedBindTip1 = 405;
+        /// <summary>
+        /// 缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�
+        /// </summary>
+        public const int LedBindTip2 = 406;
+        /// <summary>
+        ///  鍚嶇О澶暱锛屼繚瀛樺け璐ワ紝璇烽噸鏂拌缃�
+        /// </summary>
+        public const int LedNameTooLong = 407;
+        /// <summary>
+        /// CO2鏉ユ簮
+        /// </summary>
+        public const int CO2Source = 408;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -587,7 +955,7 @@
         public readonly static int Sunrisesunset = 5134;
         public readonly static int cycle = 5135;
         public readonly static int completeNext = 5136;
-        public readonly static int Selectedtimetype= 5137;
+        public readonly static int Selectedtimetype = 5137;
         public readonly static int Timecondition = 5138;
         public readonly static int condition = 5139;
         public readonly static int pushset = 5140;
@@ -645,7 +1013,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;
@@ -781,10 +1149,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;
@@ -803,127 +1171,177 @@
         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;
+        public readonly static int hour1 = 5404;
+        public readonly static int mi = 5405;
+        public readonly static int nightLightSwitch = 5406;
+        public readonly static int colorTemperature = 5407;
+        public readonly static int buzzer = 5408;
+        public readonly static int ambientLight = 5409;
+        public readonly static int illuminanceValue = 5410;
+        public readonly static int dark = 5411;
+        public readonly static int bright = 5412;
+        public readonly static int tipIlluminanceValue = 5413;
+        public readonly static int videoIntercom = 5414;
+        public readonly static int dong = 5415;
+        public readonly static int unit = 5416;
+        public readonly static int theOutdoorUnit = 5417;
+        public const int airqualitysensor = 5418;
+        public const int pm25 = 5419;
+        public const int sensortemperature= 5420;
+        public const int sensorhumidity = 5421;
+        public const int co2 = 5422;
+        public const int you = 5423;
+        public const int liang = 5424;
+        public const int cha = 5425;
+        public const int pmyou = 5426;
+        public const int pmliang = 5427;
+        public const int pmqingdu = 5428;
+        public const int pmzhongdu = 5429;
+        public const int co2qingxin = 5430;
+        public const int co2huizhuo = 5431;
+        public const int co2queyang = 5432;
+        public const int co2yanzhongqueyang= 5433;
+        public const int kongqizhiliang = 5434;
 
-        #region 鐧诲綍娉ㄥ唽
+
+
         /// <summary>
-        /// HDL Home
+        /// Evoyo Home
         /// </summary>
         public const int AppName = 10000;
         /// <summary>
         /// 甯哥敤
         /// </summary>
         public const int Favorite = 10001;
-
-
-
-		/// <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>
@@ -953,10 +1371,6 @@
         /// </summary>
         public const int PleaseInputVerificationCode = 10133;
         /// <summary>
-        /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
-        /// </summary>
-        public const int LoginByWechat = 10134;
-        /// <summary>
         /// 鐧诲綍涓�...
         /// </summary>
         public const int Logining = 10135;
@@ -964,10 +1378,6 @@
         /// 褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
         /// </summary>
         public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
-        /// <summary>
-        /// 浣忓畢鍚嶇О涓虹┖
-        /// </summary>
-        public const int TheResidenceNameNull = 10137;
         /// <summary>
         /// 閭閿欒锛岃閲嶆柊杈撳叆
         /// </summary>
@@ -980,10 +1390,6 @@
         /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
         /// </summary>
         public const int ThePWDLengthError = 10140;
-        /// <summary>
-        /// 浣犲凡琚己鍒朵笅绾匡紒
-        /// </summary>
-        public const int YouHaveBeenSignOut = 10141;
         /// <summary>
         /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
         /// </summary>
@@ -1000,10 +1406,8 @@
 		/// 宸叉湁璐﹀彿锛熺櫥褰�
 		/// </summary>
 		public const int LoginByAccountPWD_1 = 10145;
-
-
         /// <summary>
-        /// 鏀规埧闂村悕绉板凡瀛樺湪
+        /// 璇ユ埧闂村悕绉板凡瀛樺湪
         /// </summary>
 		public const int HadSameRoom = 10150;
         /// <summary>
@@ -1015,14 +1419,6 @@
         /// </summary>
 		public const int ControlSceneFail = 10152;
         /// <summary>
-        /// 鍦烘櫙涓虹┖
-        /// </summary>
-        public const int TheSceneIsNull = 10153;
-        /// <summary>
-        /// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
-        /// </summary>
-        public const int ThisSceneHaveNoDevice = 10154;
-        /// <summary>
         /// 鎿嶄綔澶辫触
         /// </summary>
         public const int FAIL = 10155;
@@ -1030,16 +1426,6 @@
         /// 鍙戦�侀獙璇佺爜澶辫触
         /// </summary>
         public const int SENDFAIL = 10156;
-        /// <summary>
-        /// 缃戝叧涓嶅湪绾�
-        /// </summary>
-		public const int TheMainGatewayIsNotOnLine = 10157;
-        /// <summary>
-        /// 涓嬩竴姝�
-        /// </summary>
-        public const int Next = 10158;
-
-
         /// <summary>
         /// 宸叉槸鏈�鏂扮増鏈�
         /// </summary>
@@ -1049,10 +1435,6 @@
         /// </summary>
 		public const int Update = 10161;
         /// <summary>
-        /// 鏇存柊鍐呭
-        /// </summary>
-		public const int UpdateContent = 10162;
-        /// <summary>
         /// 鏇存柊澶辫触
         /// </summary>
 		public const int UpdateAppFail = 10163;
@@ -1060,10 +1442,6 @@
         /// 姝e湪鏇存柊涓�...
         /// </summary>
 		public const int Updating = 10164;
-        /// <summary>
-        /// 鍙栨秷鏇存柊
-        /// </summary>
-		public const int CancelUpdating = 10165;
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
@@ -1077,129 +1455,113 @@
         /// </summary>
         public const int UpdateVersion = 10168;
         /// <summary>
-        /// 鍗忚鏂囨湰淇℃伅鍐呭
-        /// </summary>
-        public const int SLA_Title = 10169;
-        /// <summary>
-        /// 鍗忚璇︾粏
-        /// </summary>
-        public const int SLA_Detail = 10170;
-
-
-        #endregion
-
-        #region 鍒嗙被
-
-        /// <summary>
         /// 鍔熻兘
         /// </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 NoFunction = 11010;
-		/// <summary>
-		/// 缂栬緫
-		/// </summary>
-		public const int Edit = 11011;
+        /// <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 EditInfo = 11013;
-		/// <summary>
-		/// 鍔熻兘鍚嶇О
-		/// </summary>
-		public const int FunctionName = 11014;
-		/// <summary>
-		/// 鎵�灞炲尯鍩�
-		/// </summary>
-		public const int BelongZone = 11015;
-		/// <summary>
-		/// 鎵�灞炴ā鍧�
-		/// </summary>
-		public const int BelongModel = 11016;
-		/// <summary>
-		/// 鏈煡
-		/// </summary>
-		public const int UNKnown = 11017;
-		/// <summary>
-		/// 鍒嗕韩
-		/// </summary>
-		public const int Share = 11018;
-		/// <summary>
-		/// 鍒嗕韩鐨�
-		/// </summary>
-		public const int Shared = 11019;
-		/// <summary>
-		/// 閫夋嫨鍥炬爣
-		/// </summary>
-		public const int SelectIcon = 11020;
-		/// <summary>
-		/// 淇濆瓨
-		/// </summary>
-		public const int Save = 11021;
-		/// <summary>
-		/// 鎻愰啋
-		/// </summary>
-		public const int TIP = 11022;
-		/// <summary>
-		/// 鍙栨秷
-		/// </summary>
-		public const int Cancel = 11023;
-		/// <summary>
-		/// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
-		/// </summary>
-		public const int NoScene = 11024;
-		/// <summary>
-		/// 璁剧疆
-		/// </summary>
-		public const int Setting = 11025;
-		/// <summary>
-		/// 寤舵椂
-		/// </summary>
-		public const int Delay = 11026;
-		/// <summary>
-		/// 纭畾鍒犻櫎鍚楋紵
-		/// </summary>
-		public const int ConfirmDelete = 11027;
-		/// <summary>
-		/// 娣诲姞鍦烘櫙
-		/// </summary>
-		public const int AddScence = 11028;
-		/// <summary>
-		/// 鍦烘櫙鍚嶇О
-		/// </summary>
-		public const int SceneName = 11029;
-		/// <summary>
-		/// 璇疯緭鍏ュ満鏅悕绉�
-		/// </summary>
-		public const int PleaseInputSceneName = 11030;
-		/// <summary>
-		/// 娣诲姞鎵ц鐩爣
-		/// </summary>
-		public const int AddScentTargetAction = 11031;
-		/// <summary>
-		/// 閫夋嫨鍖哄煙
-		/// </summary>
-		public const int SelectZone = 11032;
-		/// <summary>
-		/// 閫夋嫨鍦烘櫙鍥剧墖
-		/// </summary>
-		public const int SelectScenePic = 11033;
+        /// <summary>
+        /// 淇℃伅缂栬緫
+        /// </summary>
+        public const int EditInfo = 11013;
+        /// <summary>
+        /// 鍔熻兘鍚嶇О
+        /// </summary>
+        public const int FunctionName = 11014;
+        /// <summary>
+        /// 鎵�灞炲尯鍩�
+        /// </summary>
+        public const int BelongZone = 11015;
+        /// <summary>
+        /// 鎵�灞炶澶�
+        /// </summary>
+        public const int BelongDevice = 11016;
+        /// <summary>
+        /// 鏈煡
+        /// </summary>
+        public const int UNKnown = 11017;
+        /// <summary>
+        /// 鍒嗕韩
+        /// </summary>
+        public const int Share = 11018;
+        /// <summary>
+        /// 鍒嗕韩鐨�
+        /// </summary>
+        public const int Shared = 11019;
+        /// <summary>
+        /// 閫夋嫨鍥炬爣
+        /// </summary>
+        public const int SelectIcon = 11020;
+        /// <summary>
+        /// 淇濆瓨
+        /// </summary>
+        public const int Save = 11021;
+        /// <summary>
+        /// 鎻愰啋
+        /// </summary>
+        public const int TIP = 11022;
+        /// <summary>
+        /// 鍙栨秷
+        /// </summary>
+        public const int Cancel = 11023;
+        /// <summary>
+        /// 娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
+        /// </summary>
+        public const int NoScene = 11024;
+        /// <summary>
+        /// 璁剧疆
+        /// </summary>
+        public const int Setting = 11025;
+        /// <summary>
+        /// 寤舵椂
+        /// </summary>
+        public const int Delay = 11026;
+        /// <summary>
+        /// 纭畾鍒犻櫎鍚楋紵
+        /// </summary>
+        public const int ConfirmDelete = 11027;
+        /// <summary>
+        /// 娣诲姞鍦烘櫙
+        /// </summary>
+        public const int AddScence = 11028;
+        /// <summary>
+        /// 鍦烘櫙鍚嶇О
+        /// </summary>
+        public const int SceneName = 11029;
+        /// <summary>
+        /// 璇疯緭鍏ュ満鏅悕绉�
+        /// </summary>
+        public const int PleaseInputSceneName = 11030;
+        /// <summary>
+        /// 娣诲姞鎵ц鐩爣
+        /// </summary>
+        public const int AddScentTargetAction = 11031;
+        /// <summary>
+        /// 閫夋嫨鍖哄煙
+        /// </summary>
+        public const int SelectZone = 11032;
+        /// <summary>
+        /// 閫夋嫨鍦烘櫙鍥剧墖
+        /// </summary>
+        public const int SelectScenePic = 11033;
         /// <summary>
         /// 纭畾瑕佺Щ闄よ鍔熻兘锛�
         /// </summary>
@@ -1216,45 +1578,10 @@
         /// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
         /// </summary>
         public const int AC_Model_None = 11037;
-
-
-        #region  璁惧绫诲瀷
         /// <summary>
         /// 鏈煡璁惧
         /// </summary>
         public const int UnknowDevice = 12100;
-        /// <summary>
-        /// 缁х數鍣�
-        /// </summary>
-        public const int OnOffOutput = 12102;
-        /// <summary>
-        /// 璋冨厜鐏�
-        /// </summary>
-        public const int DimmableLight = 12103;
-        /// <summary>
-        /// 绐楀笜
-        /// </summary>
-        public const int WindowCoveringDevice = 12104;
-        /// <summary>
-        /// 绌鸿皟
-        /// </summary>
-        public const int Thermostat = 12105;
-        /// <summary>
-        /// 浼犳劅鍣�
-        /// </summary>
-        public const int IASZone = 12106;
-        /// <summary>
-        /// 绌烘皵寮�鍏�
-        /// </summary>
-        public const int AirSwitch = 12107;
-        /// <summary>
-        /// 褰╃伅
-        /// </summary>
-        public const int ColorDimmableLight = 12108;
-        /// <summary>
-        /// 涓户鍣�
-        /// </summary>
-        public const int Repeater = 12109;
         /// <summary>
         /// 娓╁害浼犳劅鍣�
         /// </summary>
@@ -1263,12 +1590,6 @@
         /// 婀垮害浼犳劅鍣�
         /// </summary>
         public const int HumiditySensor = 12111;
-        /// <summary>
-        /// 娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        public const int TemperatureAndHumiditySensor = 12112;
-
-
         /// <summary>
         /// 鏈変汉
         /// </summary>
@@ -1301,96 +1622,86 @@
         /// 瀹夊叏
         /// </summary>
         public const int IASZone_Statu_Safe = 12507;
-
-
-        #endregion
-
-
-        #endregion
-
-        #region 涓婚〉
-
         /// <summary>
         /// 鎴块棿鍒楄〃
         /// </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>
@@ -1511,13 +1822,10 @@
         /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
         /// </summary>
         public const int TheSceneIsDelaying = 13149;
-
-
-
         /// <summary>
         /// 閫夋嫨鎽嗛
         /// </summary>
-        public const int SelectSwing=13500;
+        public const int SelectSwing = 13500;
         /// <summary>
         /// 鑷姩
         /// </summary>
@@ -1567,21 +1875,520 @@
         /// 褰撳墠 浜害
         /// </summary>
         public const int CurrentLightLevel = 13604;
+        /// <summary>
+        /// 妯℃澘
+        /// </summary>
+        public const int Templation = 13605;
+        /// <summary>
+        /// 璇诲彇涓�
+        /// </summary>
+        public const int Reading = 13606;
+        /// <summary>
+        /// 娣诲姞浣忓畢
+        /// </summary>
+        public const int AddResidence = 13607;
+        /// <summary>
+        /// 鏂板缓浣忓畢
+        /// </summary>
+        public const int CreatNewResidence = 13608;
+        /// <summary>
+        /// 鑷畾涔�
+        /// </summary>
+        public const int Customize = 13609;
+        /// <summary>
+        /// 椤圭洰鍚�
+        /// </summary>
+        public const int ProgramName = 13610;
+        /// <summary>
+        /// 璇峰~鍐欓」鐩悕绉�
+        /// </summary>
+        public const int PleaseInputProgramName = 13611;
+        /// <summary>
+        /// 妤�
+        /// </summary>
+        public const int FloorNo = 13612;
+        /// <summary>
+        /// 1-100涔嬮棿
+        /// </summary>
+        public const int BetweenOneAndHundred = 13613;
+        /// <summary>
+        /// 鍗曞厓
+        /// </summary>
+        public const int UnitNo = 13614;
+        /// <summary>
+        /// 鎴�
+        /// </summary>
+        public const int HouseholdsNo = 13615;
+        /// <summary>
+        /// 灞傚彿鍔犳埧鍙凤紝渚嬪0201
+        /// </summary>
+        public const int HouseholdsNoTip = 13616;
+        /// <summary>
+        /// 涓句緥锛氭垚閮介噾鍫傞噾鑼傚簻椤圭洰-2鏍�-3鍗曞厓-0201鎴�
+        /// </summary>
+        public const int HouseholdsNoExample = 13617;
+        /// <summary>
+        /// 閫夋嫨鍒涘缓鏂瑰紡
+        /// </summary>
+        public const int SelectCreatMode = 13618;
+        /// <summary>
+        /// 鏂瑰紡
+        /// </summary>
+        public const int Way = 13619;
+        /// <summary>
+        /// 鏈夋ā鏉�
+        /// </summary>
+        public const int HadTemplate = 13620;
+        /// <summary>
+        /// 鏃犳ā鏉�
+        /// </summary>
+        public const int NotHadTemplate = 13621;
+        /// <summary>
+        /// 鏃犺澶囧垱寤�
+        /// </summary>
+        public const int NotHadDeviceToCreat = 13622;
+        /// <summary>
+        /// 鏈夎澶囧垱寤�
+        /// </summary>
+        public const int HadDeviceToCreat = 13623;
+        /// <summary>
+        /// 鑷畾涔夋柊寤轰綇瀹�
+        /// </summary>
+        public const int CustomCreatNewResidence = 13624;
+        /// <summary>
+        /// 鑷畾涔夊悕绉�
+        /// </summary>
+        public const int CustomName = 13625;
+        /// <summary>
+        /// 鑷畾涔夊唴瀹�
+        /// </summary>
+        public const int CustomContent = 13626;
+        /// <summary>
+        /// 浣忓畢閰嶇疆
+        /// </summary>
+        public const int ResidenceSettion = 13627;
+        /// <summary>
+        /// 鏃犳ā鏉挎湁璁惧
+        /// </summary>
+        public const int NotTemplateAndHadDevice = 13628;
+        /// <summary>
+        /// 鏈夋ā鏉挎湁璁惧
+        /// </summary>
+        public const int HadTemplateAndHadDevice = 13629;
+        /// <summary>
+        /// 鏃犳ā鏉挎棤璁惧
+        /// </summary>
+        public const int NotTemplateAndNotDevice = 13630;
+        /// <summary>
+        /// 鍖哄煙
+        /// </summary>
+        public const int Area = 13631;
+        /// <summary>
+        /// 璁惧鍜屽姛鑳�
+        /// </summary>
+        public const int DeviceAndFunction = 13632;
+        /// <summary>
+        /// 妤煎眰鏁�
+        /// </summary>
+        public const int FloorCount = 13633;
+        /// <summary>
+        /// 鎴块棿鏁�
+        /// </summary>
+        public const int RoomCount = 13634;
+        /// <summary>
+        /// 璁惧鏁�
+        /// </summary>
+        public const int DeviceCount = 13635;
+        /// <summary>
+        /// 鍔熻兘鏁�
+        /// </summary>
+        public const int FunctionCount = 13636;
+        /// <summary>
+        /// 鏃犲睆缃戝叧
+        /// </summary>
+        public const int NotScreanGateway = 13637;
+        /// <summary>
+        /// 璺敱缃戝叧
+        /// </summary>
+        public const int RouterGateway = 13638;
+        /// <summary>
+        /// 鏈夌綉绾挎坊鍔犵綉鍏�
+        /// </summary>
+        public const int AddGatewayByNetworkCable = 13639;
+        /// <summary>
+        /// WIFI娣诲姞缃戝叧
+        /// </summary>
+        public const int AddGatewayByWifi = 13640;
+        /// <summary>
+        /// 璁惧鍒楄〃
+        /// </summary>
+        public const int DeviceList = 13641;
+        /// <summary>
+        /// 宸叉悳绱㈣澶囨暟锛�
+        /// </summary>
+        public const int HadScanDeviceCount = 13642;
+        /// <summary>
+        /// 涓�
+        /// </summary>
+        public const int An = 13643;
+        /// <summary>
+        /// 鍙栨秷鎼滅储
+        /// </summary>
+        public const int CancelSearch = 13644;
+        /// <summary>
+        /// 淇″彿
+        /// </summary>
+        public const int Signal = 13645;
+        /// <summary>
+        /// 瑙g粦
+        /// </summary>
+        public const int UnBind = 13646;
+        /// <summary>
+        /// 璁惧鍑哄巶鍚嶇О
+        /// </summary>
+        public const int FactoryNameOfEquipmen = 13647;
+        /// <summary>
+        /// 璁惧澶囨敞鍚嶇О
+        /// </summary>
+        public const int DeviceNoteName = 13648;
+        /// <summary>
+        /// 鐐瑰嚮缂栬緫妤煎眰涓庡娉�
+        /// </summary>
+        public const int ClickAndEditorRoomAndNote = 13649;
+        /// <summary>
+        /// 缃戝叧閫夋嫨
+        /// </summary>
+        public const int GatewaySelect = 13650;
+        /// <summary>
+        /// 鍦烘櫙鍒楄〃
+        /// </summary>
+        public const int SceneList = 13651;
+        /// <summary>
+        /// 鏆傛棤鍦烘櫙,璇锋坊鍔�
+        /// </summary>
+        public const int NotScenePleaseAdd = 13652;
+        /// <summary>
+        /// 铏氭嫙
+        /// </summary>
+        public const int Virtual = 13653;
+        /// <summary>
+        /// 鏈湴
+        /// </summary>
+        public const int Local = 13654;
+        /// <summary>
+        /// 杩滅▼
+        /// </summary>
+        public const int Remote = 13655;
+        /// <summary>
+        /// 浣忓畢鍒楄〃
+        /// </summary>
+        public const int ResidenceList = 13656;
+        /// <summary>
+        /// 鎼滅储浣忓畢鍏抽敭璇�
+        /// </summary>
+        public const int SearchResidenceKeyWorld = 13657;
+        /// <summary>
+        /// 鎴峰悕
+        /// </summary>
+        public const int ResidenceName2 = 13658;
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>
+        public const int EditorTime = 13659;
+        /// <summary>
+        /// 纭鍒囨崲
+        /// </summary>
+        public const int ConfirmSwitch = 13660;
+        /// <summary>
+        /// 璇疯緭鍏ヨ嚜瀹氫箟鍚嶇О
+        /// </summary>
+        public const int PleaseInputCustomName = 13661;
+        /// <summary>
+        /// 璇疯緭鑷畾涔夊唴瀹�
+        /// </summary>
+        public const int PleaseInputCustomContent = 13662;
+        /// <summary>
+        /// 榛樿
+        /// </summary>
+        public const int Default = 13663;
+        /// <summary>
+        /// 鐢辫繎鍒拌繙
+        /// </summary>
+        public const int FromNearToFar = 13664;
+        /// <summary>
+        /// 鐢辫繙鍒拌繎
+        /// </summary>
+        public const int FromFarToNear = 13665;
+        /// <summary>
+        /// 杩斿洖{0}涓婚〉
+        /// </summary>
+        public const int GobackToHomePage2 = 13666;
+        /// <summary>
+        /// 淇濆瓨妯℃澘{0}鍒癆PP
+        /// </summary>
+        public const int SaveTemplateDataToApp2 = 13667;
+        /// <summary>
+        /// 淇濆瓨澶囦唤{0}鍒癆PP
+        /// </summary>
+        public const int SaveBackDataToApp2 = 13668;
+        /// <summary>
+        /// 鏈湴澶囦唤淇濆瓨鎴愬姛
+        /// </summary>
+        public const int SaveLocalBackDataSuccess = 13669;
+        /// <summary>
+        /// 澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?
+        /// </summary>
+        public const int BackUpDataIsEsixtAndPickUp = 13670;
+        /// <summary>
+        /// 妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬ā鏉挎暟鎹�
+        /// </summary>
+        public const int NotHadTemplateDataToSelect = 13671;
+        /// <summary>
+        /// 閫夋嫨妯℃澘
+        /// </summary>
+        public const int SelectTemplate = 13672;
+        /// <summary>
+        /// 宸查�夋ā鐗�
+        /// </summary>
+        public const int HadSelectTemplate = 13673;
+        /// <summary>
+        /// 璇烽�夋嫨妯℃澘瀵硅薄
+        /// </summary>
+        public const int PleaseSelectTemplate = 13674;
+        /// <summary>
+        /// {0}杩樻病鏈夐�夋嫨妯℃澘瀵硅薄,纭瑕佽繑鍥�?
+        /// </summary>
+        public const int HadNotSelectTemplateAndGoBack = 13675;
+        /// <summary>
+        /// 妯℃澘涓搴旂殑缃戝叧
+        /// </summary>
+        public const int CorrespondingGatewayInTemplate = 13676;
+        /// <summary>
+        /// 鍙栨秷缁戝畾
+        /// </summary>
+        public const int CancelBinded = 13677;
+        /// <summary>
+        /// 妯℃澘涓搴旂殑缃戝叧杩樻病璁剧疆{0}纭瑕佽繑鍥烇紵
+        /// </summary>
+        public const int HadNotSelectTemplateAndGoBack2 = 13678;
+        /// <summary>
+        /// 妯℃澘涓澶囨暟锛�
+        /// </summary>
+        public const int DeviceCountInTemplate = 13679;
+        /// <summary>
+        /// 璇烽�夋嫨妯℃澘涓殑璁惧
+        /// </summary>
+        public const int PleaseSelectTemplateDevice = 13680;
+        /// <summary>
+        /// 妯℃澘涓搴旂殑璁惧
+        /// </summary>
+        public const int CorrespondingDeviceInTemplate = 13681;
+        /// <summary>
+        /// 妯℃澘
+        /// </summary>
+        public const int Template = 13683;
+        /// <summary>
+        /// 纭鍒犻櫎銆寋0}銆嶈澶囧強鍔熻兘锛�
+        /// </summary>
+        public const int DeleteDeviceMsg2 = 13684;
+        /// <summary>
+        /// 妯$増璁惧鏁颁笌缁戝畾璁惧鏁颁笉涓�鑷磠0}璇锋鏌ヨ澶�
+        /// </summary>
+        public const int TemplateCountAndDeviceCountIsNotEqualMsg = 13685;
+        /// <summary>
+        /// 瀵煎叆鍔熻兘涓庡満鏅�
+        /// </summary>
+        public const int ImportFunctionAndScene = 13686;
+        /// <summary>
+        /// 鏈夎澶囨湭閫夋嫨妯℃澘
+        /// </summary>
+        public const int IsExsitNotSelectTemplateDevice = 13687;
+        /// <summary>
+        /// 鎵嬫満浼犵綉鍏�
+        /// </summary>
+        public const int PhoneSendToGateway = 13688;
+        /// <summary>
+        /// 缃戝叧浼犺澶�
+        /// </summary>
+        public const int GatewaySendToDevice = 13689;
+        /// <summary>
+        /// 棰勮鎬昏�楁椂
+        /// </summary>
+        public const int EstimatedTotalTime = 13690;
+        /// <summary>
+        /// 涓�閿鍏�
+        /// </summary>
+        public const int OneClickImport = 13691;
+        /// <summary>
+        /// 妯℃澘涓㈠け,璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆
+        /// </summary>
+        public const int TemplateDataIsLostPleaseReSetMsg = 13692;
+        /// <summary>
+        /// 璇峰厛閫夋嫨缃戝叧鐨勬ā鏉垮璞�
+        /// </summary>
+        public const int PleaseSelectgatewayTemplateBefore = 13693;
+        /// <summary>
+        /// 璁惧涓庢ā鏉垮凡缁忓畬鍏ㄥ尮閰�
+        /// </summary>
+        public const int DeviceAndTemplateAlreadyMatchExactly = 13694;
+        /// <summary>
+        /// 鏈湴澶囦唤
+        /// </summary>
+        public const int LocalBackup = 13695;
+        /// <summary>
+        /// 浜戠澶囦唤
+        /// </summary>
+        public const int CloudBackup = 13696;
+        /// <summary>
+        /// 鎭㈠鍒皗0}鏈湴
+        /// </summary>
+        public const int RecoverToLocation = 13697;
+        /// <summary>
+        /// 涓婁紶鍒皗0}浜戠
+        /// </summary>
+        public const int UplaodToCloud = 13698;
+        /// <summary>
+        /// 涓嬭浇鍒癆PP
+        /// </summary>
+        public const int DownLoadToApp = 13699;
+        /// <summary>
+        /// 纭畾涓嬭浇姝ゅ浠藉埌APP?
+        /// </summary>
+        public const int ComfirmDownLoadThisBackupToApp = 13700;
+        /// <summary>
+        /// 璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆椤圭洰绫诲瀷
+        /// </summary>
+        public const int PleaseClickTopMenuAndResetProgramType = 13701;
+        /// <summary>
+        /// 纭畾涓婁紶鎸囧畾澶囦唤鍒颁簯绔�?
+        /// </summary>
+        public const int ComfirmUploadBackupToCloud = 13702;
+        /// <summary>
+        /// 澶囦唤鏁版嵁涓嬭浇鎴愬姛
+        /// </summary>
+        public const int DownLoadBackuoSuccess = 13703;
+        /// <summary>
+        /// 纭畾灏嗘暟鎹仮澶嶅埌鏈湴锛�
+        /// </summary>
+        public const int ComfirmRecoverBackupToLocation = 13704;
+        /// <summary>
+        /// 绉讳氦缁檣0}鐢ㄦ埛
+        /// </summary>
+        public const int HandoverToUser = 13705;
+        /// <summary>
+        /// 鎺堟潈缁檣0}璋冭瘯浜哄憳
+        /// </summary>
+        public const int AuthorizedToCommissioningPersonnel = 13706;
+        /// <summary>
+        /// 閰嶇疆{0}浣忓畢
+        /// </summary>
+        public const int AllocationOfHousing = 13707;
+        /// <summary>
+        /// 鍒囨崲{0}浣忓畢
+        /// </summary>
+        public const int SwitchResidence2 = 13708;
+        /// <summary>
+        /// 鏈湴妯℃澘
+        /// </summary>
+        public const int LocalTemplate = 13709;
+        /// <summary>
+        /// 浜戠妯℃澘
+        /// </summary>
+        public const int CloudTemplate = 13710;
+        /// <summary>
+        /// 鏈湴杩樻病鏈夋ā鏉�
+        /// </summary>
+        public const int NotHadTemplateInLocal = 13711;
+        /// <summary>
+        /// 妯℃澘瀵煎叆鎴愬姛
+        /// </summary>
+        public const int ImportTemplateSuccess = 13712;
+        /// <summary>
+        /// 鍔熻兘鍦烘櫙宸插叏閮ㄥ鍏�
+        /// </summary>
+        public const int AllFUnctionAndSceneHadImported = 13713;
+        /// <summary>
+        /// 妯℃澘瀵煎叆澶辫触
+        /// </summary>
+        public const int ImportTemplateFail = 13714;
+        /// <summary>
+        /// 鏌ョ湅鍘熷洜
+        /// </summary>
+        public const int ViewReason = 13715;
+        /// <summary>
+        /// 瀵煎嚭鏂囨湰{0}璇存槑
+        /// </summary>
+        public const int ExportTextExplain = 13716;
+        /// <summary>
+        /// 杩樻病鏈夊垱寤哄尯鍩�
+        /// </summary>
+        public const int DoNotHadAddedRoom = 13717;
+        /// <summary>
+        /// 浜戠杩樻病鏈夋ā鏉�
+        /// </summary>
+        public const int NotHadTemplateInDb = 13718;
+        /// <summary>
+        /// 涓嬭浇鎴愬姛
+        /// </summary>
+        public const int DownLoadSuccess = 13719;
+        /// <summary>
+        /// 涓嬭浇澶辫触
+        /// </summary>
+        public const int DownLoadFail = 13720;
+        /// <summary>
+        /// 淇濆瓨鍒颁簯绔�
+        /// </summary>
+        public const int SaveToColund = 13721;
+        /// <summary>
+        /// 璇疯緭鍏ユā鏉垮悕瀛�
+        /// </summary>
+        public const int PleaseInputTemplateName = 13722;
+        /// <summary>
+        /// 妯℃澘鍚嶅瓧宸茬粡瀛樺湪
+        /// </summary>
+        public const int TheTemplateNameIsEsixt = 13723;
+        /// <summary>
+        /// 涓婁紶妯℃澘鎴愬姛
+        /// </summary>
+        public const int UploadTemplateSuccess = 13724;
+        /// <summary>
+        /// 涓婁紶妯℃澘澶辫触
+        /// </summary>
+        public const int UploadTemplateFail = 13725;
+        /// <summary>
+        /// 姝よ处鍙锋棤鏉冪櫥褰�
+        /// </summary>
+        public const int ThisAccountHasNoAuthorityToLogin = 13726;
+        /// <summary>
+        /// 涓嬭浇妯℃澘澶辫触
+        /// </summary>
+        public const int DownloadTemplateFail = 13727;
+        /// <summary>
+        /// 缂栬緫浣忓畢鍚嶇О澶辫触
+        /// </summary>
+        public const int uEditorResidenceNameFail = 13728;
+        /// <summary>
+        /// 缂栬緫浣忓畢鍖哄煙澶辫触
+        /// </summary>
+        public const int uEditorResidenceAreaFail = 13729;
+        /// <summary>
+        /// 涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+        /// </summary>
+        public const int uYouCannotTransferOwnershipToYourself = 13730;
+        /// <summary>
+        /// 涓嶈兘鑷繁鎺堟潈缁欒嚜宸�
+        /// </summary>
+        public const int uYouCanotDelegateToYourself = 13731;
+        /// <summary>
+        /// 鎺堟潈璐﹀彿
+        /// </summary>
+        public const int uAuthorizedAccount = 13732;
 
 
-
-        #endregion
-
-
-        
-
-
-
-
-		/// <summary>
-		/// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
-		/// </summary>
-		public const int PswLengthMsg = 15000;
+        /// <summary>
+        /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+        /// </summary>
+        public const int PswLengthMsg = 15000;
         /// <summary>
         /// 1涓皬鍐欏瓧姣�
         /// </summary>
@@ -2959,7 +3766,7 @@
         /// </summary>
         public const int uCarbonMonoxideRevealed = 15393;
         /// <summary>
-        /// 鏈変笉鏄庣墿浣撶粡杩�
+        /// 鏈変汉缁忚繃
         /// </summary>
         public const int uHadUnKnowObjectPassed = 15394;
         /// <summary>
@@ -3385,7 +4192,7 @@
         /// <summary>
         /// 鍗忚皟鍣�
         /// </summary>
-        public const int uCoordinator= 15514;
+        public const int uCoordinator = 15514;
         /// <summary>
         /// 铏氭嫙椹卞姩
         /// </summary>
@@ -4877,7 +5684,7 @@
         /// <summary>
         /// 璺宠浆鍒扮Щ鍔ㄨ澶�
         /// </summary>
-        public const int uJumpToMobileDevice= 15905;
+        public const int uJumpToMobileDevice = 15905;
         /// <summary>
         /// WLAN璁剧疆杩炴帴瀹跺涵WiFi
         /// </summary>
@@ -4891,7 +5698,7 @@
         /// </summary>
         public const int uAddApWirelessGatewayMsg1 = 15908;
         /// <summary>
-        /// 鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
+        /// 1.缃戝叧鐑偣鐨勮处鍙蜂负hdlZigbeeGW-XXX,瀵嗙爜涓篽dl123456{0}2.鍏蜂綋璐﹀彿鍜屽瘑鐮佸彲鏌ョ湅缃戝叧鏍囩{0}3.鐐瑰嚮"{1}"瀹屾垚鎵嬫満杩炴帴缃戝叧鐑偣{0}4.鐐瑰嚮涓嬩竴姝�
         /// </summary>
         public const int uAddApWirelessGatewayMsg2 = 15909;
         /// <summary>
@@ -5171,7 +5978,7 @@
         /// </summary>
         public const int uSendPasswordFail = 15980;
         /// <summary>
-        /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+        /// 璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
         /// </summary>
         public const int uPleaseSelectGatewayXXNet = 15981;
         /// <summary>
@@ -5191,11 +5998,16 @@
         /// </summary>
         public const int uAddGatewayGuide = 15985;
         /// <summary>
-        /// 1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛屽苟瑙傚療缃戝彛LED浜苟闂儊鎴栬瀵熷澹崇綉鍙f寚绀虹伅浜苟闂儊
+        /// 璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛岀綉鍏充笂鐢垫垨鑰呮仮澶嶅嚭鍘傝
+        /// 缃箣鍚庯紝绯荤粺杩涜閲嶅惎锛屾寔缁�50绉掞紙绯荤粺鎸囩ず鐏疭YS甯镐寒锛夛紝
+        /// 寰呯郴缁熸寚绀虹伅SYS鍙樻垚1绉掑懆鏈熼棯鐑侊紝姝ゆ椂鍙互浣跨敤鎵嬫満APP
+        /// 杩涜娣诲姞缃戝叧姝ラ銆�
         /// </summary>
         public const int uAddWiredGatewayHelp1 = 15986;
         /// <summary>
-        /// 2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓锛岃繖鏃惰瀵熷澹崇郴缁熸寚绀虹伅锛屽鏋�1绉掗棯鐑侊紝琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯革紝鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+        /// 鎭㈠鍑哄巶璁剧疆锛氶暱鎸塟B/RST鎸夐敭10绉掞紝姝ゆ椂Z igee缃戠粶鎸�
+        /// 绀虹伅锛圸B锛夌姸鎬佷负蹇棯锛屽緟涓変釜鐏叏鐏紝琛ㄧず鎭㈠鍑哄巶璁剧疆
+        /// 鎴愬姛锛屽垯鍙澗寮�鎸夐敭锛岀綉鍏冲紑濮嬮噸鍚郴缁�
         /// </summary>
         public const int uAddWiredGatewayHelp2 = 15987;
         /// <summary>
@@ -5210,14 +6022,6 @@
         /// 2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
         /// </summary>
         public const int uWiredGatewayHardDeviceHelp2 = 15990;
-        /// <summary>
-        /// 绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
-        /// </summary>
-        public const int uAddWirelessGatewayHelp1 = 15991;
-        /// <summary>
-        /// 2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
-        /// </summary>
-        public const int uAddWirelessGatewayHelp2 = 15992;
         /// <summary>
         /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
         /// </summary>
@@ -5491,7 +6295,7 @@
         /// </summary>
         public const int uWorkRoom = 16060;
         /// <summary>
-        /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+        /// 鐢垫満鏁版嵁寮傚父,纭宸茬粡瀹夎瀵艰建鍚�,璇烽噸缃數鏈�
         /// </summary>
         public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
         /// <summary>
@@ -5599,11 +6403,11 @@
         /// </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>
@@ -5646,6 +6450,561 @@
         /// 璇峰厛闃呰骞跺悓鎰忋�婇殣绉佹潈鏀跨瓥銆嬪拰銆婃湇鍔℃潯娆俱��
         /// </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;
+        /// <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>
+        /// 1.涓婄數,绯荤粺鍚姩(缁跨伅闂儊50绉�){0}2.閰嶇綉妯″紡(钃濊壊甯镐寒20绉�){0}3.缃戝叧寤虹珛WI-FI鐑偣鎴愬姛(钃濈伅5绉掑懆鏈熼棯鐑�){0}4.鐐瑰嚮涓嬩竴姝�
+        /// </summary>
+        public const int uAddMiniGatewayMsg1 = 16125;
+        /// <summary>
+        /// 鑹叉俯
+        /// </summary>
+        public const int uColorTemperature = 16128;
+        /// <summary>
+        /// Mini澶滅伅
+        /// </summary>
+        public const int uMiniNightLight = 16129;
+        /// <summary>
+        /// 鐕冩皵娉勯湶
+        /// </summary>
+        public const int uGasLeakage = 16130;
+        /// <summary>
+        /// 蹇界暐
+        /// </summary>
+        public const int uNeglect = 16131;
+        /// <summary>
+        /// 铚傞福鍣ㄥ紑鍏�
+        /// </summary>
+        public const int uBuzzerSwitch = 16132;
+        /// <summary>
+        /// 灏忓鐏紑鍏�
+        /// </summary>
+        public const int uMiniLightSwitch = 16133;
+        /// <summary>
+        /// 璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+        /// </summary>
+        public const int uSetDeviceFunctionTypeFail = 16134;
+        /// <summary>
+        /// 鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+        /// </summary>
+        public const int uGetSceneListFailAndTimeOut = 16135;
+        /// <summary>
+        /// 闇�閲嶆柊缁戝畾
+        /// </summary>
+        public const int uNeedToRebind = 16136;
+        /// <summary>
+        /// 鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+        /// </summary>
+        public const int uUnKnownErrorAndLostData = 16137;
+        /// <summary>
+        /// 鐑熼浘浼犳劅鍣�
+        /// </summary>
+        public const int uSensorFire = 16138;
+        /// <summary>
+        /// 姘翠镜浼犳劅鍣�
+        /// </summary>
+        public const int uSensorWater = 16139;
+        /// <summary>
+        /// 鐕冩皵浼犳劅鍣�
+        /// </summary>
+        public const int uSensorCarbonMonoxide = 16140;
+        /// <summary>
+        /// 绱ф�ユ寜閽�
+        /// </summary>
+        public const int uSensorEmergencyButton = 16141;
+        /// <summary>
+        /// 闂ㄧ獥浼犳劅鍣�
+        /// </summary>
+        public const int uSensorDoorWindow = 16142;
+        /// <summary>
+        /// 閽ュ寵鎵�
+        /// </summary>
+        public const int uKeyfob = 16143;
+        /// <summary>
+        /// 鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
+        /// </summary>
+        public const int uColorLengthMsg = 16144;
+        /// <summary>
+        /// 闀挎寜姝ゆ寜閿�
+        /// </summary>
+        public const int uLongPressThisButton = 16145;
+        /// <summary>
+        /// Mini缃戝叧鏈�澶у彧鑳芥坊鍔�16涓澶�
+        /// </summary>
+        public const int uMiniGatewayMaxDeviceCountMsg = 16146;
+        /// <summary>
+        /// 寮�鍏抽敭
+        /// </summary>
+        public const int uSwitchButton = 16147;
+        /// <summary>
+        /// 杩囨埛
+        /// </summary>
+        public const int uTransfer = 16148;
+        /// <summary>
+        /// 浣忓畢杩囨埛
+        /// </summary>
+        public const int uTransferOfResidence = 16149;
+        /// <summary>
+        /// 杞Щ浣忓畢鍒板叾浠朎voyo
+        /// </summary>
+        public const int uTransferOfResidenceToOtherEvoyoAccount1 = 16150;
+        /// <summary>
+        /// Home璐﹀彿
+        /// </summary>
+        public const int uTransferOfResidenceToOtherEvoyoAccount2 = 16151;
+        /// <summary>
+        /// 璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+        /// </summary>
+        public const int uThisOperationIsIrreversiblePleaseNote = 16152;
+        /// <summary>
+        /// 1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+        /// </summary>
+        public const int uTheReceiverIsValidAccountForEvoyoHome = 16153;
+        /// <summary>
+        /// 2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+        /// </summary>
+        public const int uTheReceiverAndTheTransferPartyCannotBeTheSameAccount = 16154;
+        /// <summary>
+        /// 3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+        /// </summary>
+        public const int uIfTheTransferIsSuccessfulTheRightToUseTheHouseWillBeCancelled = 16155;
+        /// <summary>
+        /// 杩囨埛璐﹀彿
+        /// </summary>
+        public const int uTransferResidenceAccount = 16156;
+        /// <summary>
+        /// 璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+        /// </summary>
+        public const int uPleaseInputReceiverPhoneOrEmail = 16157;
+        /// <summary>
+        /// 鏌ョ湅
+        /// </summary>
+        public const int uSearch1 = 16158;
+        /// <summary>
+        /// 瀹氭椂鑷姩鍏抽棴
+        /// </summary>
+        public const int uAutomaticTimingOff = 16159;
+        /// <summary>
+        /// 涓嶅叧闂�
+        /// </summary>
+        public const int uNotClose = 16160;
+        /// <summary>
+        /// 缁堟
+        /// </summary>
+        public const int uTermination = 16161;
+        /// <summary>
+        /// 姝e湪绉讳氦缁欑敤鎴�,璇风◢鍚�...
+        /// </summary>
+        public const int uHandoverToUserPleaseWaitting = 16162;
+        /// <summary>
+        /// 姝e湪鎺堟潈缁欒皟璇曚汉鍛�,璇风◢鍚�...
+        /// </summary>
+        public const int uAuthorizingToDebuggingPersonnelPleaseWaitting = 16163;
+        /// <summary>
+        /// 杩囨埛鎴愬姛
+        /// </summary>
+        public const int uTransferSuccess = 16164;
+        /// <summary>
+        /// 杩囨埛澶辫触
+        /// </summary>
+        public const int uTransferFail = 16165;
+        /// <summary>
+        /// 鎭枩XXXXX鎴愪负銆孨NNNN銆嶇鐞嗗憳
+        /// </summary>
+        public const int uCongratulationsXXBecomingNNAdministrator = 16166;
+        /// <summary>
+        /// 妫�娴嬪埌杩樻病鏈夊浠�,璇峰厛澶囦唤
+        /// </summary>
+        public const int uIsNotHadBackupByCheckPleaseBackup = 16167;
+        /// <summary>
+        /// 鏇挎崲
+        /// </summary>
+        public const int uReplace = 16168;
+        /// <summary>
+        /// 鏇挎崲缃戝叧
+        /// </summary>
+        public const int uReplaceGateway = 16169;
+        /// <summary>
+        /// 璇烽�夋嫨琚浛鎹㈢殑缃戝叧
+        /// </summary>
+        public const int uPleaseSelectGatewayToBeReplaced = 16170;
+        /// <summary>
+        /// 浜鸿劯璇嗗埆
+        /// </summary>
+        public const int uFaceRecognition = 16171;
+        /// <summary>
+        /// 闈欒剦绾�
+        /// </summary>
+        public const int uStriaVenosus = 16172;
+        /// <summary>
+        /// 闈欒剦绾瑰紑閿佹垚鍔�
+        /// </summary>
+        public const int uStriaVenosusUnLockSuccess = 16173;
+        /// <summary>
+        /// 闈欒剦绾瑰紑閿佸け璐�
+        /// </summary>
+        public const int uStriaVenosusUnLockFail = 16174;
+        /// <summary>
+        /// 浜鸿劯璇嗗埆寮�閿佹垚鍔�
+        /// </summary>
+        public const int uFaceRecognitionUnLockSuccess = 16175;
+        /// <summary>
+        /// 浜鸿劯璇嗗埆寮�閿佸け璐�
+        /// </summary>
+        public const int uFaceRecognitionUnLockFail = 16176;
+        /// <summary>
+        /// 纭鏇挎崲鎺夌綉鍏�:{0}?
+        /// </summary>
+        public const int uReplaceGatewayConfirmMsg = 16177;
+        /// <summary>
+        /// 姝e湪鑾峰彇閰嶇疆鏁版嵁
+        /// </summary>
+        public const int uGettingConfigurationData = 16178;
+        /// <summary>
+        /// 鐩爣缃戝叧妫�娴嬩笉鍒板浠芥暟鎹�,鏃犳硶鎵ц鏇挎崲鎿嶄綔
+        /// </summary>
+        public const int uTaegetGatewayNotHadBackupAndDoNotReplace = 16179;
+        /// <summary>
+        /// 姝e湪鍙樻洿鏈湴閰嶇疆
+        /// </summary>
+        public const int uChangingLocalConfiguration = 16180;
+        /// <summary>
+        /// 鏇挎崲缃戝叧鎴愬姛
+        /// </summary>
+        public const int uReplacegatewaySuccess = 16181;
+        /// <summary>
+        /// 閫夋嫨浣跨敤鐨勫浠�
+        /// </summary>
+        public const int uSelectUseBackup = 16182;
+        /// <summary>
+        ///  鏄惁浣跨敤澶囦唤:{0}?
+        /// </summary>
+        public const int uSelectUseBackupConfirmMsg = 16183;
+        /// <summary>
+        /// 鏈�楂樺
+        /// </summary>
+        public const int uTheHighestPoint = 16184;
+        /// <summary>
+        /// 鏈�浣庡
+        /// </summary>
+        public const int uTheLowestPoint = 16185;
+        /// <summary>
+        /// 鎵撳紑鐑樺共
+        /// </summary>
+        public const int uOpenDry = 16186;
+        /// <summary>
+        /// 鍏抽棴鐑樺共
+        /// </summary>
+        public const int uCloseDry = 16187;
+        /// <summary>
+        /// 鎵撳紑娑堟瘨
+        /// </summary>
+        public const int uOpenDisinfect = 16188;
+        /// <summary>
+        /// 鍏抽棴娑堟瘨
+        /// </summary>
+        public const int uCloseDisinfect = 16189;
+        /// <summary>
+        /// 鎵撳紑鐓ф槑
+        /// </summary>
+        public const int uOpenLighting = 16190;
+        /// <summary>
+        /// 鍏抽棴鐓ф槑
+        /// </summary>
+        public const int uCloseLighting = 16191;
+        /// <summary>
+        /// 鎵撳紑椋庡共
+        /// </summary>
+        public const int uOpenAirdry = 16192;
+        /// <summary>
+        /// 鍏抽棴椋庡共
+        /// </summary>
+        public const int uCloseAirdry = 16193;
+        /// <summary>
+        /// 缃戝叧涓婄數閰嶇綉
+        /// </summary>
+        public const int uGatewayPowerDistributionNetwork = 16194;
+        /// <summary>
+        /// 鎵嬫満杩炴帴缃戝叧鐑偣
+        /// </summary>
+        public const int uMobileConnectionGatewayHotspot = 16195;
+        /// <summary>
+        /// 璇疯緭鍏IFI鍜屽瘑鐮�
+        /// </summary>
+        public const int uPleaseInputWifiAndPassword = 16196;
+        /// <summary>
+        /// 鍙戦�佸眬鍩熺綉璐﹀彿銆佸瘑鐮�
+        /// </summary>
+        public const int uSendLanAccountAndPassword = 16197;
+        /// <summary>
+        /// 1.濉啓璺敱鍣ㄧ殑璐﹀彿鍜屽瘑鐮亄0}2.鐐瑰嚮涓嬩竴姝ワ紝灏嗚矾鐢卞櫒璐﹀彿鍜屽瘑鐮佸彂閫佽嚦缃戝叧{0}3.缃戝叧鎺ユ敹鎴愬姛锛岀櫧鍏夐棯鐑�
+        /// </summary>
+        public const int uAddMiniGatewayMsg2 = 16198;
+        /// <summary>
+        /// 缃戝叧杩炴帴璺敱鍣�
+        /// </summary>
+        public const int uGatewayConnectionRouter = 16199;
+        /// <summary>
+        /// 1.缃戝叧鎺ユ敹璺敱鍣ㄨ处鍙峰拰瀵嗙爜鎴愬姛{0}2.绯荤粺閲嶅惎(缁跨伅闂儊50绉�){0}3.杩炴帴灞�鍩熺綉鎴愬姛(钃濈伅1绉掑懆鏈熼棯鐑�){0}4.鐐瑰嚮"{1}"瀹屾垚鎵嬫満杩炴帴瀹跺涵WIFI{0}5.鐐瑰嚮涓嬩竴姝�
+        /// </summary>
+        public const int uAddMiniGatewayMsg3 = 16200;
+        /// <summary>
+        /// 鎵嬫満杩炴帴缃戝叧
+        /// </summary>
+        public const int uMobileConnectionGateway = 16201;
+        /// <summary>
+        /// 1.app鑻ユ樉绀鸿繛鎺ョ殑缃戝叧璁惧,琛ㄦ槑杩炴帴鎴愬姛{0}2.璇峰墠寰�娣诲姞鍏朵粬璁惧{0}3.鑻ラ暱鏃堕棿鏃犳硶杩炴帴鎴愬姛,璇峰墠寰�"鏌ョ湅甯姪"
+        /// </summary>
+        public const int uAddMiniGatewayMsg4 = 16202;
+        /// <summary>
+        /// 寮傚父鎯呭喌澶勭悊
+        /// </summary>
+        public const int uExceptionHandling = 16203;
+        /// <summary>
+        /// 缃戝叧纭欢鏂囦欢甯姪
+        /// </summary>
+        public const int uGatewayHardwareFileHelp = 16204;
+        /// <summary>
+        /// 鎿嶄綔鎸囧紩
+        /// </summary>
+        public const int uOperationGuide = 16205;
+        /// <summary>
+        /// 1銆佹寜鍑诲紑鍏抽敭,鑻ュ紑鍏抽敭鍜屽鐏棤寮傚父,鍒欏鐏寒璧风櫧鑹茬幆褰㈢伅鍏�
+        /// </summary>
+        public const int uAddMiniGatewayHelp1 = 16206;
+        /// <summary>
+        /// 2銆侀暱鎸夋垨鐭寜鎭㈠鍑哄巶璁剧疆璁剧疆鎸夐敭,鑻ユ寜閿拰鐘舵�佹寚绀虹伅鏃犲紓甯�,鍒欏揩闂豢鑹茬伅鍏�
+        /// </summary>
+        public const int uAddMiniGatewayHelp2 = 16207;
+        /// <summary>
+        /// 鎭㈠鍑哄巶璁剧疆:鐢ㄥ崱閽堥暱鎸夋仮澶嶅嚭鍘傝缃寜閿�10绉�,姝ゆ椂缃戝叧鐘舵�佷负鎸囩ず鐏豢鑹插揩闂�,寰呯伅鍏夐棯鐑佸仠姝�,鍗冲彲鏉惧紑鎸夐敭,缃戝叧寮�濮嬬郴缁熼噸鍚�(缁垮厜涓�绉掑懆鏈熼棯鐑�)
+        /// </summary>
+        public const int uAddMiniGatewayHelp3 = 16208;
+        /// <summary>
+        /// 鎹㈢粦:鑻ラ渶瑕佹洿鎹㈢粦瀹氳处鍙�,涓嶆竻闄ゆ暟鎹�,鐭寜鎭㈠鍑哄巶閿�,60绉掑唴閲嶆柊鐢ㄦ柊鐨勮处鍙锋悳绱㈢綉鍏冲嵆鍙�
+        /// </summary>
+        public const int uAddMiniGatewayHelp4 = 16209;
+        /// <summary>
+        /// 1銆佹坊鍔犵綉鍏宠繃绋嬩腑锛屽眬鍩熺綉璐﹀彿鍜屽瘑鐮佸彂閫侀敊璇紝缃戝叧涓�鐩�
+        ///鎸佺画淇濇寔姝e湪鑱旂綉鐘舵�侊紙鎸佺画钃濈伅锛�3鍒嗛挓锛岄殢鍚庤浆鎴愬缓绔嬬綉
+        ///鍏崇儹鐐圭姸鎬侊紙钃濈伅5绉掗棿闅旈棯鐑侊級锛屾鏃跺彲鎵嬫満APP閫�鍑鸿嚦缃�
+        ///鍏虫坊鍔犻〉闈紝閲嶆柊杩涜缃戝叧娣诲姞锛岄噸鏂板彂閫佽处鍙凤紝瀵嗙爜
+        /// </summary>
+        public const int uAddMiniGatewayHelp5 = 16210;
+        /// <summary>
+        ///2銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堣摑鑹茬伅1绉掗棿闅旈棯鐑侊級锛�
+        ///鎵嬫満APP涓嶅皬蹇冮��鍑轰簡杩炴帴鐣岄潰锛屽彲鍓嶅線鏈夌嚎缃戝叧鐣岄潰锛岀洿
+        ///鎺ヨ繘琛岀綉鍏宠繛鎺�
+        /// </summary>
+        public const int uAddMiniGatewayHelp6 = 16211;
+        /// <summary>
+        ///3銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堣摑鑹茬伅1绉掗棿闅旈棯鐑侊級锛�
+        ///鎵嬫満APP涓�鐩磋繛鎺ヤ笉涓婄綉鍏筹紝鍙互鍏堥��鍑篈PP鍚庡彴锛岄噸鏂扮櫥
+        ///鍏ヨ繘琛岃繛鎺�
+        /// </summary>
+        public const int uAddMiniGatewayHelp7 = 16212;
+        /// <summary>
+        /// 4銆乄IFI鏈夋尝鍔紝瀵艰嚧缃戝叧鑱旂綉澶辫触锛堟寔缁摑鐏級锛屽彲閲嶆柊涓婄數
+        /// </summary>
+        public const int uAddMiniGatewayHelp8 = 16213;
+        /// <summary>
+        /// 1銆佺煭鎸塟B/RST鎸夐敭 锛孼B缃戠粶鎸囩ず鐏竴鐩撮棯鐑侊紝鍒欒〃闈㈡鎸夐敭鍜屾寚绀虹伅鍧囨甯�
+        /// </summary>
+        public const int uAddWirelessGatewayHelp1 = 16214;
+        /// <summary>
+        ///2銆佺煭鎸塇ID/WCFG鎸夐敭锛岀郴缁熸寚绀虹伅SYS闂儊锛岃〃闈㈡鎸夐敭鍜屾寚绀虹伅鍧囨甯�
+        /// </summary>
+        public const int uAddWirelessGatewayHelp2 = 16215;
+        /// <summary>
+        ///3銆丷ESTART鎸夐敭涓洪噸鍚敭锛岀煭鎸夋鎸夐敭锛岀綉鍏抽噸鍚紝绯荤粺鎸囩ず鐏紑濮嬪父浜�
+        /// </summary>
+        public const int uAddWirelessGatewayHelp3 = 16216;
+        /// <summary>
+        ///1銆佹仮澶嶅嚭鍘傝缃細闀挎寜ZB/RST閿綅10绉掞紝10绉掑唴锛孼igbee
+        ///缃戠粶鎸囩ず鐏紙ZB锛夌姸鎬佷负蹇棯锛�10绉掗挓鍚庯紝绯荤粺鎸囩ず鐏疭YS
+        ///蹇棯5绉掞紝5绉掑唴杩炵画鎸塟B/RST閿袱娆★紝鑻ユ墍鏈夌伅鐔勭伃锛屽垯鎭�
+        ///澶嶅嚭鍘傝缃垚鍔燂紝缃戝叧寮�濮嬮噸鍚郴缁熴��
+        /// </summary>
+        public const int uAddWirelessGatewayHelp4 = 16217;
+        /// <summary>
+        ///2銆佺‘璁ゆ墜鏈篈PP鏄惁杩炴帴缃戝叧锛屽彲鍦ˋPP杩涜瀹氫綅鎿嶄綔锛岃嫢杩炴帴姝e父锛岀綉鍏崇郴缁熸寚绀虹伅浼氬揩闂�
+        /// </summary>
+        public const int uAddWirelessGatewayHelp5 = 16218;
+        /// <summary>
+        ///3銆丄P閰嶇綉妯″紡锛氬彲閫氳繃闀挎寜HID/WCFG鎸夐敭  5绉掞紝浣跨綉鍏崇洿
+        ///鎺ヨ繘鍏ュ缓绔嬬儹鐐规ā寮忥紝鐏厜鐘舵�佸彉鍖栦负鎸変笅鎸夐敭锛岀郴缁熸寚绀虹伅
+        ///SYS蹇棯5绉掑悗锛岀郴缁熸寚绀虹伅SYS鍙樹负甯镐寒妯″紡锛屾鏃剁儹鐐瑰畬鎴�
+        ///寤虹珛
+        /// </summary>
+        public const int uAddWirelessGatewayHelp6 = 16219;
+        /// <summary>
+        ///1銆佹坊鍔犵綉鍏宠繃绋嬩腑锛屽眬鍩熺綉璐﹀彿鍜屽瘑鐮佸彂閫侀敊璇紝绯荤粺閲嶅惎
+        ///鍚庯紝缃戝叧涓�鐩存寔缁繚鎸佹鍦ㄨ仈缃戠姸鎬侊紙绯荤粺鎸囩ず鐏疭YS 3绉掑懆
+        ///鏈熼棯鐑侊紝鐏厜鍋忔殫锛屾寔缁�3鍒嗛挓锛夛紝闅忓悗杞垚寤虹珛缃戝叧鐑偣鐘�
+        ///鎬侊紙绯荤粺鎸囩ず鐏疭YS 5绉掗棿闅旈棯鐑侊紝鐏厜鍋忎寒锛夛紝姝ゆ椂鍙墜鏈�
+        ///APP閫�鍑鸿嚦缃戝叧娣诲姞椤甸潰锛岄噸鏂拌繘琛岀綉鍏虫坊鍔狅紝閲嶆柊鍙戦�佽处鍙凤紝
+        ///瀵嗙爜
+        /// </summary>
+        public const int uAddWirelessGatewayHelp7 = 16220;
+        /// <summary>
+        ///2銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堢郴缁熸寚绀虹伅SYS 1绉掗棿闅�
+        ///闂儊锛夛紝鎵嬫満APP涓嶅皬蹇冮��鍑轰簡杩炴帴鐣岄潰锛屽彲鍓嶅線娣诲姞鏈夌嚎缃�
+        ///鍏崇晫闈紝鐩存帴杩涜缃戝叧杩炴帴
+        /// </summary>
+        public const int uAddWirelessGatewayHelp8 = 16221;
+        /// <summary>
+        ///3銆佸湪缃戝叧宸茬粡杩炴帴灞�鍩熺綉鐘舵�佷笅锛堢郴缁熸寚绀虹伅SYS 1绉掗棿闅�
+        ///闂儊锛夛紝鎵嬫満APP涓�鐩磋繛鎺ヤ笉涓婄綉鍏筹紝鍙互鍏堥��鍑篈PP鍚庡彴锛�
+        ///閲嶆柊鐧诲叆杩涜杩炴帴鎴栧湪鏈夌嚎缃戝叧鐣岄潰鐩存帴鎼滅储缃戝叧
+        /// </summary>
+        public const int uAddWirelessGatewayHelp9 = 16222;
+        /// <summary>
+        ///4銆乄IFI鏈夋尝鍔紝瀵艰嚧缃戝叧鑱旂綉澶辫触锛屽彲閲嶆柊涓婄數
+        /// </summary>
+        public const int uAddWirelessGatewayHelp10 = 16223;
+        /// <summary>
+        /// 1.璇风‘淇濈綉鍏崇敤缃戠嚎姝e父杩炴帴璺敱鍣▄0}2.缃戝彛鎸囩ず鐏疞AN鏃犺寰嬮棯鐑亄0}3.绯荤粺鎸囩ず鐏疭YS涓�1绉掑懆鏈熼棯鐑侊紝鐏厜鍋忔殫{0}4.鎵嬫満APP鍜岀綉鍏抽娆¤繛鎺�,璇峰皢鎵嬫満淇濇寔鍦ㄤ笌缃戝叧鍚屼竴涓眬鍩熺綉涓�(WIFI){0}5.杩涜鈥滀笅涓�姝モ�濇搷浣�
+        /// </summary>
+        public const int uAddWiredGatewayMsg1 = 16224;
+        /// <summary>
+        /// 1.涓婄數,绯荤粺鍚姩(绯荤粺鎸囩ず鐏疭YS 7绉掑悗浜捣,鎸佺画50绉掑父浜�){0}2.缃戝叧杩炴帴灞�鍩熺綉(SYS 3绉掑懆鏈熼棯鐑�,鐏厜鍋忔殫,鎸佺画20绉�){0}3.缃戝叧寤虹珛WI-FI鐑偣(SYS 5绉掑懆鏈熼棯鐑�,鐏厜鍙樹寒){0}4.缃戝叧寤虹珛鐑偣鎴愬姛{0}5.鐐瑰嚮涓嬩竴姝�
+        /// </summary>
+        public const int uAddWirelessApGatewayMsg1 = 16225;
+        /// <summary>
+        /// 1.濉啓璺敱鍣ㄧ殑璐﹀彿鍜屽瘑鐮亄0}2.鐐瑰嚮涓嬩竴姝ワ紝灏嗚矾鐢卞櫒璐﹀彿鍜屽瘑鐮佸彂閫佽嚦缃戝叧{0}3.缃戝叧鎺ユ敹鎴愬姛,绯荤粺鎸囩ず鐏疭YS闂儊
+        /// </summary>
+        public const int uAddWirelessApGatewayMsg2 = 16226;
+        /// <summary>
+        /// 1.绯荤粺閲嶅惎(SYS 7绉掑悗浜捣,鎸佺画50绉掑父浜�){0}2.缃戝叧姝e湪杩炴帴璺敱鍣�(SYS 3绉掑懆鏈熼棯鐑�,鐏厜鍋忔殫){0}3.缃戝叧杩炴帴璺敱鍣ㄦ垚鍔�(SYS 1绉掑懆鏈熼棯鐑�,鐏厜鍋忔殫){0}4.杩涜鎵嬫満APP鍜岀綉鍏崇殑杩炴帴{0}5.棣栨杩炴帴灏嗘墜鏈轰繚鎸佸湪涓庣綉鍏冲悓涓�涓眬鍩熺綉涓�(WIFI){0}6.鐐瑰嚮"{1}"瀹屾垚鎵嬫満杩炴帴瀹跺涵WIFI{0}7.杩涜"涓嬩竴姝�"鎿嶄綔
+        /// </summary>
+        public const int uAddWirelessApGatewayMsg3 = 16227;
+        /// <summary>
+        /// 澶�
+        /// </summary>
+        public const int uDate1 = 16228;
+        /// <summary>
+        /// 鍛�
+        /// </summary>
+        public const int uWeek1 = 16229;
+        /// <summary>
+        /// 涓湀
+        /// </summary>
+        public const int uOneMonth1 = 16230;
+        /// <summary>
+        /// 鍙戠幇APP鏂扮増鏈�,椹笂鍗囩骇{0}寮�鍚柊浣撻獙鍝
+        /// </summary>
+        public const int uAppUpdateMsg1 = 16231;
+        /// <summary>
+        /// 鍙戠幇缃戝叧鏂扮増鏈�,椹笂鍗囩骇{0}寮�鍚柊浣撻獙鍝
+        /// </summary>
+        public const int uGatewayUpdateMsg1 = 16232;
+        /// <summary>
+        /// 鍏憡
+        /// </summary>
+        public const int uNotice = 16233;
+
+        /// <summary>
+        /// 浜鸿劯
+        /// </summary>
+        public const int uFace = 16234;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -5845,7 +7204,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>
@@ -5857,186 +7216,36 @@
         /// </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>
-        /// 鏂规偊鐜闈㈡澘 -> 鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+        /// 鏂规偊鐜闈㈡澘 ->鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
         /// </summary>
         public const int uAddFangyueEnvironmentPanelMsg = 21021;
         /// <summary>
         /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔� 
         /// </summary>
         public const int uAddCurtaunPanelMsg = 21022;
+        /// <summary>
+        /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorCeilingGasMsg = 21023;
+        /// <summary>
+        /// 鐞冨瀷绉诲姩浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorSphericalMotionMsg = 21024;
 
 
-        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
-        /// <summary>
-        /// 闀滃儚ID涓�1305(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱揣鎬ユ寜閽�
-        /// </summary>
-        public const int uDeviceModelId1305 = 30000;
-        /// <summary>
-        /// 闀滃儚ID涓�1300(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱噧姘斾紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1300 = 30001;
-        /// <summary>
-        /// 闀滃儚ID涓�1302(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱儫闆句紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1302 = 30002;
-        /// <summary>
-        /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭按娴镐紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1304 = 30003;
-        /// <summary>
-        /// 閽ュ寵鎵�
-        /// </summary>
-        public const int uKeyfob = 30004;
-        /// <summary>
-        /// 闀滃儚ID涓�1301(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氶棬绐椾紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1301 = 30005;
-        /// <summary>
-        /// 闀滃儚ID涓�4100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭櫤鑳界┖寮�
-        /// </summary>
-        public const int uDeviceModelId4100 = 30006;
-        /// <summary>
-        /// 闀滃儚ID涓�100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
-        /// </summary>
-        public const int uDeviceModelId100 = 30007;
-        /// <summary>
-        /// 闀滃儚ID涓�200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId200 = 30008;
-        /// <summary>
-        /// 闀滃儚ID涓�1200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�220Pir浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceModelId1200 = 30009;
-        /// <summary>
-        /// 闀滃儚ID涓�1鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
-        /// </summary>
-        public const int uDeviceModelId1 = 30010;
-        /// <summary>
-        /// 闀滃儚ID涓�201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId201 = 30011;
-        /// <summary>
-        /// 闀滃儚ID涓�202鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId202 = 30012;
-        /// <summary>
-        /// 闀滃儚ID涓�2300鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3璺户鐢靛櫒灏忔ā鍧�
-        /// </summary>
-        public const int uDeviceModelId2300 = 30013;
-        /// <summary>
-        /// 闀滃儚ID涓�6鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
-        /// </summary>
-        public const int uDeviceModelId6 = 30014;
-        /// <summary>
-        /// 闀滃儚ID涓�0鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳皟璇曡澶�
-        /// </summary>
-        public const int uDeviceModelId0 = 30015;
-        /// <summary>
-        /// 闀滃儚ID涓�101鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘绠$姸鐢垫満
-        /// </summary>
-        public const int uDeviceModelId101 = 30016;
-        /// <summary>
-        /// 闀滃儚ID涓�3900鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氫腑缁у櫒
-        /// </summary>
-        public const int uDeviceModelId3900 = 30017;
-        /// <summary>
-        /// 闀滃儚ID涓�203鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId203 = 30018;
-        /// <summary>
-        /// 闀滃儚ID涓�210鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(鍙甫鐢垫簮搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId210 = 30019;
-        /// <summary>
-        /// 闀滃儚ID涓�1303(鏆傚畾)鐨勫畼鏂圭殑榛樿鍚嶅瓧锛氱孩澶栦紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1303 = 30020;
-        /// <summary>
-        /// 闀滃儚ID涓�2500鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1璺皟鍏夊櫒灏忔ā鍧�
-        /// </summary>
-        public const int uDeviceModelId2500 = 30021;
-        /// <summary>
-        /// 闀滃儚ID涓�4200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞琤uspro鍗忚杞崲鍣�
-        /// </summary>
-        public const int uDeviceModelId4200 = 30022;
-        /// <summary>
-        /// 闀滃儚ID涓�4201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞�485鍗忚杞崲鍣�
-        /// </summary>
-        public const int uDeviceModelId4201 = 30023;
-        /// <summary>
-        /// 闀滃儚ID涓�3600鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee绌鸿皟缃戝叧妯″潡
-        /// </summary>
-        public const int uDeviceModelId3600 = 30024;
-        /// <summary>
-        /// 闀滃儚ID涓�2800鐨勮澶囩殑瀹樻柟鍚嶅瓧锛欻06C
-        /// </summary>
-        public const int uDeviceModelId2800 = 30025;
-        /// <summary>
-        /// 闀滃儚ID涓�220鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
-        /// </summary>
-        public const int uDeviceModelId220 = 30026;
-        /// <summary>
-        /// 闀滃儚ID涓�221鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
-        /// </summary>
-        public const int uDeviceModelId221 = 30027;
-        /// <summary>
-        /// 闀滃儚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 DeviceModelId2310 = 30038;
-
-        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
+        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮� 娉細杩欎簺鎵�灞濱D宸茬粡涓嶅啀缁存姢鈽呪槄鈽呪槄
         /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼
         /// </summary>
@@ -6046,53 +7255,9 @@
         /// </summary>
         public const int uDeviceBelongId200 = 40001;
         /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�1200鐨勭炕璇戝悕瀛楋細浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceBelongId1200 = 40002;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�2300鐨勭炕璇戝悕瀛楋細缁х數鍣�
-        /// </summary>
-        public const int uDeviceBelongId2300 = 40003;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�2500鐨勭炕璇戝悕瀛楋細璋冨厜鍣�
-        /// </summary>
-        public const int uDeviceBelongId2500 = 40004;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細闂ㄩ攣
-        /// </summary>
-        public const int uDeviceBelongId2800 = 40005;
-        /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�3600鐨勭炕璇戝悕瀛楋細绌鸿皟
         /// </summary>
         public const int uDeviceBelongId3600 = 40006;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�3900鐨勭炕璇戝悕瀛楋細涓户鍣�
-        /// </summary>
-        public const int uDeviceBelongId3900 = 40007;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細鏅鸿兘绌哄紑
-        /// </summary>
-        public const int uDeviceBelongId4100 = 40008;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�4200鐨勭炕璇戝悕瀛楋細杞崲鍣�
-        /// </summary>
-        public const int uDeviceBelongId4200 = 40009;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�9鐨勭炕璇戝悕瀛楋細褰╃伅
-        /// </summary>
-        public const int uDeviceBelongId9 = 40010;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceBelongId10 = 40011;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�11鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceBelongId11 = 40012;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�12鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceBelongId12 = 40013;
         /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏�
         /// </summary>
@@ -6105,13 +7270,11 @@
         /// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜
         /// </summary>
         public const int uDeviceBelongId15 = 40016;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱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鏂囦欢閲岄潰鈽呪槄鈽呪槄
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭i噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -6214,5 +7377,34 @@
         /// 鏅鸿兘绌哄紑
         /// </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;
+        /// <summary>
+        /// 鐞冨瀷绉诲姩浼犳劅鍣�
+        /// </summary>
+        public const int uDeviceDirectionName30 = 70029;
+        /// <summary>
+        /// 鏅捐。鏋�
+        /// </summary>
+        public const int uDeviceDirectionName31 = 70030;
+        /// <summary>
+        /// 绌烘皵璐ㄩ噺浼犳劅鍣�
+        /// </summary>
+        public const int uDeviceDirectionName32 = 70031;
+
     }
 }

--
Gitblit v1.8.0