From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码

---
 ZigbeeApp/Shared/R.cs |  908 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 493 insertions(+), 415 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index c2703ae..646002c
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -350,7 +350,7 @@
         /// </summary>
         public const int AddFreshAirModulPanelMsg = 239;
         /// <summary>
-        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
+        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
         /// </summary>
         public const int SetDoorLockNomallyOpen = 241;
         /// <summary>
@@ -578,6 +578,90 @@
         /// 绌烘皵璐ㄩ噺浼犳劅鍣�
         /// </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;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -619,7 +703,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;
@@ -677,7 +761,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;
@@ -813,10 +897,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;
@@ -841,7 +925,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;
@@ -856,10 +940,23 @@
         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;
 
 
 
-        #region 鐧诲綍娉ㄥ唽
         /// <summary>
         /// HDL Home
         /// </summary>
@@ -868,117 +965,114 @@
         /// 甯哥敤
         /// </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>
@@ -1008,10 +1102,6 @@
         /// </summary>
         public const int PleaseInputVerificationCode = 10133;
         /// <summary>
-        /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
-        /// </summary>
-        public const int LoginByWechat = 10134;
-        /// <summary>
         /// 鐧诲綍涓�...
         /// </summary>
         public const int Logining = 10135;
@@ -1019,10 +1109,6 @@
         /// 褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
         /// </summary>
         public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
-        /// <summary>
-        /// 浣忓畢鍚嶇О涓虹┖
-        /// </summary>
-        public const int TheResidenceNameNull = 10137;
         /// <summary>
         /// 閭閿欒锛岃閲嶆柊杈撳叆
         /// </summary>
@@ -1035,10 +1121,6 @@
         /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
         /// </summary>
         public const int ThePWDLengthError = 10140;
-        /// <summary>
-        /// 浣犲凡琚己鍒朵笅绾匡紒
-        /// </summary>
-        public const int YouHaveBeenSignOut = 10141;
         /// <summary>
         /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
         /// </summary>
@@ -1055,10 +1137,8 @@
 		/// 宸叉湁璐﹀彿锛熺櫥褰�
 		/// </summary>
 		public const int LoginByAccountPWD_1 = 10145;
-
-
         /// <summary>
-        /// 鏀规埧闂村悕绉板凡瀛樺湪
+        /// 璇ユ埧闂村悕绉板凡瀛樺湪
         /// </summary>
 		public const int HadSameRoom = 10150;
         /// <summary>
@@ -1070,14 +1150,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;
@@ -1085,16 +1157,6 @@
         /// 鍙戦�侀獙璇佺爜澶辫触
         /// </summary>
         public const int SENDFAIL = 10156;
-        /// <summary>
-        /// 缃戝叧涓嶅湪绾�
-        /// </summary>
-		public const int TheMainGatewayIsNotOnLine = 10157;
-        /// <summary>
-        /// 涓嬩竴姝�
-        /// </summary>
-        public const int Next = 10158;
-
-
         /// <summary>
         /// 宸叉槸鏈�鏂扮増鏈�
         /// </summary>
@@ -1104,10 +1166,6 @@
         /// </summary>
 		public const int Update = 10161;
         /// <summary>
-        /// 鏇存柊鍐呭
-        /// </summary>
-		public const int UpdateContent = 10162;
-        /// <summary>
         /// 鏇存柊澶辫触
         /// </summary>
 		public const int UpdateAppFail = 10163;
@@ -1115,10 +1173,6 @@
         /// 姝e湪鏇存柊涓�...
         /// </summary>
 		public const int Updating = 10164;
-        /// <summary>
-        /// 鍙栨秷鏇存柊
-        /// </summary>
-		public const int CancelUpdating = 10165;
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
@@ -1132,129 +1186,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>
-		/// 娌℃湁鍦烘櫙{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>
+        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>
@@ -1271,45 +1309,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>
@@ -1318,12 +1321,6 @@
         /// 婀垮害浼犳劅鍣�
         /// </summary>
         public const int HumiditySensor = 12111;
-        /// <summary>
-        /// 娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        public const int TemperatureAndHumiditySensor = 12112;
-
-
         /// <summary>
         /// 鏈変汉
         /// </summary>
@@ -1356,96 +1353,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>
@@ -1566,13 +1553,10 @@
         /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
         /// </summary>
         public const int TheSceneIsDelaying = 13149;
-
-
-
         /// <summary>
         /// 閫夋嫨鎽嗛
         /// </summary>
-        public const int SelectSwing=13500;
+        public const int SelectSwing = 13500;
         /// <summary>
         /// 鑷姩
         /// </summary>
@@ -1625,18 +1609,11 @@
 
 
 
-        #endregion
 
-
-        
-
-
-
-
-		/// <summary>
-		/// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
-		/// </summary>
-		public const int PswLengthMsg = 15000;
+        /// <summary>
+        /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+        /// </summary>
+        public const int PswLengthMsg = 15000;
         /// <summary>
         /// 1涓皬鍐欏瓧姣�
         /// </summary>
@@ -3014,7 +2991,7 @@
         /// </summary>
         public const int uCarbonMonoxideRevealed = 15393;
         /// <summary>
-        /// 鏈変笉鏄庣墿浣撶粡杩�
+        /// 鏈変汉缁忚繃
         /// </summary>
         public const int uHadUnKnowObjectPassed = 15394;
         /// <summary>
@@ -3440,7 +3417,7 @@
         /// <summary>
         /// 鍗忚皟鍣�
         /// </summary>
-        public const int uCoordinator= 15514;
+        public const int uCoordinator = 15514;
         /// <summary>
         /// 铏氭嫙椹卞姩
         /// </summary>
@@ -4932,7 +4909,7 @@
         /// <summary>
         /// 璺宠浆鍒扮Щ鍔ㄨ澶�
         /// </summary>
-        public const int uJumpToMobileDevice= 15905;
+        public const int uJumpToMobileDevice = 15905;
         /// <summary>
         /// WLAN璁剧疆杩炴帴瀹跺涵WiFi
         /// </summary>
@@ -5226,7 +5203,7 @@
         /// </summary>
         public const int uSendPasswordFail = 15980;
         /// <summary>
-        /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+        /// 璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
         /// </summary>
         public const int uPleaseSelectGatewayXXNet = 15981;
         /// <summary>
@@ -5781,6 +5758,71 @@
         /// 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>
+        /// 鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭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;
+
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -6016,7 +6058,10 @@
         /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
         /// </summary>
         public const int uAddSensorCeilingGasMsg = 21023;
-
+        /// <summary>
+        /// 鐞冨瀷绉诲姩浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorSphericalMotionMsg = 21024;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -6182,7 +6227,27 @@
         /// <summary>
         /// 闀滃儚ID涓�1307鐨勮澶囩殑榛樿鍚嶅瓧锛歅M2.5绌烘皵璐ㄩ噺浼犳劅鍣�
         /// </summary>
-        public const int uDeviceModelId1307 = 30040;
+        public const int uDeviceModelId1307 = 30040;
+        /// <summary>
+        /// 闀滃儚ID涓�212鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾﹀鍔熻兘闈㈡澘
+        /// </summary>
+        public const int uDeviceModelId212 = 30041;
+        /// <summary>
+        /// 闀滃儚ID涓�230鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾︾幆澧冮潰鏉�
+        /// </summary>
+        public const int uDeviceModelId230 = 30042;
+        /// <summary>
+        /// 闀滃儚ID涓�11鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歁ini缃戝叧
+        /// </summary>
+        public const int uDeviceModelId11 = 30043;
+        /// <summary>
+        /// 闀滃儚ID涓�20000鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳壊娓╃伅
+        /// </summary>
+        public const int uDeviceModelId20000 = 30044;
+        /// <summary>
+        /// 闀滃儚ID涓�1205鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱悆鍨嬬Щ鍔ㄤ紶鎰熷櫒
+        /// </summary>
+        public const int uDeviceModelId1205 = 30045;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -6378,5 +6443,18 @@
         /// 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