From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4

---
 ZigbeeApp/Shared/R.cs | 1277 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 643 insertions(+), 634 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
index d7b2d33..1d4ae1d
--- 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>
@@ -562,6 +562,142 @@
         /// 鑳屽厜鐏鑹�
         /// </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;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -603,7 +739,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;
@@ -661,7 +797,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;
@@ -797,10 +933,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;
@@ -825,7 +961,7 @@
         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 timeSetSone = 5389;
         public readonly static int invalidSetting = 5390;
         public readonly static int hour = 5391;
         public readonly static int lockOpen = 5392;
@@ -841,129 +977,138 @@
         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;
 
 
 
-        #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>
@@ -993,10 +1138,6 @@
         /// </summary>
         public const int PleaseInputVerificationCode = 10133;
         /// <summary>
-        /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
-        /// </summary>
-        public const int LoginByWechat = 10134;
-        /// <summary>
         /// 鐧诲綍涓�...
         /// </summary>
         public const int Logining = 10135;
@@ -1004,10 +1145,6 @@
         /// 褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
         /// </summary>
         public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
-        /// <summary>
-        /// 浣忓畢鍚嶇О涓虹┖
-        /// </summary>
-        public const int TheResidenceNameNull = 10137;
         /// <summary>
         /// 閭閿欒锛岃閲嶆柊杈撳叆
         /// </summary>
@@ -1020,10 +1157,6 @@
         /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
         /// </summary>
         public const int ThePWDLengthError = 10140;
-        /// <summary>
-        /// 浣犲凡琚己鍒朵笅绾匡紒
-        /// </summary>
-        public const int YouHaveBeenSignOut = 10141;
         /// <summary>
         /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
         /// </summary>
@@ -1040,10 +1173,8 @@
 		/// 宸叉湁璐﹀彿锛熺櫥褰�
 		/// </summary>
 		public const int LoginByAccountPWD_1 = 10145;
-
-
         /// <summary>
-        /// 鏀规埧闂村悕绉板凡瀛樺湪
+        /// 璇ユ埧闂村悕绉板凡瀛樺湪
         /// </summary>
 		public const int HadSameRoom = 10150;
         /// <summary>
@@ -1055,14 +1186,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;
@@ -1070,16 +1193,6 @@
         /// 鍙戦�侀獙璇佺爜澶辫触
         /// </summary>
         public const int SENDFAIL = 10156;
-        /// <summary>
-        /// 缃戝叧涓嶅湪绾�
-        /// </summary>
-		public const int TheMainGatewayIsNotOnLine = 10157;
-        /// <summary>
-        /// 涓嬩竴姝�
-        /// </summary>
-        public const int Next = 10158;
-
-
         /// <summary>
         /// 宸叉槸鏈�鏂扮増鏈�
         /// </summary>
@@ -1089,10 +1202,6 @@
         /// </summary>
 		public const int Update = 10161;
         /// <summary>
-        /// 鏇存柊鍐呭
-        /// </summary>
-		public const int UpdateContent = 10162;
-        /// <summary>
         /// 鏇存柊澶辫触
         /// </summary>
 		public const int UpdateAppFail = 10163;
@@ -1100,10 +1209,6 @@
         /// 姝e湪鏇存柊涓�...
         /// </summary>
 		public const int Updating = 10164;
-        /// <summary>
-        /// 鍙栨秷鏇存柊
-        /// </summary>
-		public const int CancelUpdating = 10165;
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
@@ -1117,129 +1222,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 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>
-		/// 娌℃湁鍦烘櫙 {\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>
@@ -1256,45 +1345,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>
@@ -1303,12 +1357,6 @@
         /// 婀垮害浼犳劅鍣�
         /// </summary>
         public const int HumiditySensor = 12111;
-        /// <summary>
-        /// 娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        public const int TemperatureAndHumiditySensor = 12112;
-
-
         /// <summary>
         /// 鏈変汉
         /// </summary>
@@ -1341,96 +1389,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>
@@ -1551,13 +1589,10 @@
         /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
         /// </summary>
         public const int TheSceneIsDelaying = 13149;
-
-
-
         /// <summary>
         /// 閫夋嫨鎽嗛
         /// </summary>
-        public const int SelectSwing=13500;
+        public const int SelectSwing = 13500;
         /// <summary>
         /// 鑷姩
         /// </summary>
@@ -1610,18 +1645,11 @@
 
 
 
-        #endregion
 
-
-        
-
-
-
-
-		/// <summary>
-		/// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
-		/// </summary>
-		public const int PswLengthMsg = 15000;
+        /// <summary>
+        /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+        /// </summary>
+        public const int PswLengthMsg = 15000;
         /// <summary>
         /// 1涓皬鍐欏瓧姣�
         /// </summary>
@@ -2999,7 +3027,7 @@
         /// </summary>
         public const int uCarbonMonoxideRevealed = 15393;
         /// <summary>
-        /// 鏈変笉鏄庣墿浣撶粡杩�
+        /// 鏈変汉缁忚繃
         /// </summary>
         public const int uHadUnKnowObjectPassed = 15394;
         /// <summary>
@@ -3425,7 +3453,7 @@
         /// <summary>
         /// 鍗忚皟鍣�
         /// </summary>
-        public const int uCoordinator= 15514;
+        public const int uCoordinator = 15514;
         /// <summary>
         /// 铏氭嫙椹卞姩
         /// </summary>
@@ -4917,7 +4945,7 @@
         /// <summary>
         /// 璺宠浆鍒扮Щ鍔ㄨ澶�
         /// </summary>
-        public const int uJumpToMobileDevice= 15905;
+        public const int uJumpToMobileDevice = 15905;
         /// <summary>
         /// WLAN璁剧疆杩炴帴瀹跺涵WiFi
         /// </summary>
@@ -5211,7 +5239,7 @@
         /// </summary>
         public const int uSendPasswordFail = 15980;
         /// <summary>
-        /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+        /// 璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
         /// </summary>
         public const int uPleaseSelectGatewayXXNet = 15981;
         /// <summary>
@@ -5531,7 +5559,7 @@
         /// </summary>
         public const int uWorkRoom = 16060;
         /// <summary>
-        /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+        /// 鐢垫満鏁版嵁寮傚父,纭宸茬粡瀹夎瀵艰建鍚�,璇烽噸缃數鏈�
         /// </summary>
         public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
         /// <summary>
@@ -5750,6 +5778,178 @@
         /// 甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
         /// </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>
+        /// 鎻掔數鍚�,闀挎寜缃戝叧寮�鍏抽敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+        /// </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;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5950,7 +6150,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>
@@ -5962,19 +6162,19 @@
         /// </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>
@@ -5985,171 +6185,13 @@
         /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭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 uDeviceModelId2310 = 30038;
-        /// <summary>
-        /// 闀滃儚ID涓�1306鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鍚搁《鐕冩皵浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceModelId1306 = 30039;
-
-        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
+        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮� 娉細杩欎簺鎵�灞濱D宸茬粡涓嶅啀缁存姢鈽呪槄鈽呪槄
         /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼
         /// </summary>
@@ -6159,53 +6201,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>
@@ -6218,17 +6216,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>
@@ -6335,5 +6327,22 @@
         /// 鍚搁《鐕冩皵浼犳劅鍣�
         /// </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;
+
     }
 }

--
Gitblit v1.8.0