From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/R.cs | 1437 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 750 insertions(+), 687 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 1997e16..08e348f 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -269,6 +269,17 @@
         public readonly static int CLose = 182;
         public readonly static int Opening = 183;
         public readonly static int DoorLockOpen = 184;
+        public readonly static int Year = 185;
+        public readonly static int RectifySuccess = 186;
+        public readonly static int RectifyFailed = 187;
+        public readonly static int SetTempPasswordTip2 = 188;
+        public readonly static int SetTempPasswordTip3 = 189;
+        public readonly static int SetTempPasswordTip4 = 190;
+        public readonly static int SetTempPasswordTip5 = 191;
+        public readonly static int SetTempPasswordTip1 = 192;
+
+
+
 
         public readonly static int RemindSetting = 548;
         public readonly static int AddNewUser = 650;
@@ -531,330 +542,340 @@
 
 
 
-        #region 鐧诲綍娉ㄥ唽
-        /// <summary>
-        /// HDL Home
-        /// </summary>
-        public const int AppName = 10000;
+		#region 鐧诲綍娉ㄥ唽
+		/// <summary>
+		/// HDL Home
+		/// </summary>
+		public const int AppName = 10000;
 
 
+		/// <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 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;
+
+
+		#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 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;
+
+
+		#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 PhoneNum = 10100;
+		/// 璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
+		/// </summary>
+		public const int TheRoomIsSharedNotAllowedToOperate = 13120;
         /// <summary>
-        /// 閭
+        /// 杩樻病閫夋嫨鎴块棿锛岃鍏堥�夋嫨
         /// </summary>
-        public const int Email = 10101;
+        public const int NotSelectZone = 13121;
         /// <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 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;
+        public const int SelectTimeForAction = 13122;
+
 
 
         #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 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;
-
-
-        #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;
-
-        #endregion
-
-
-
-
 
         /// <summary>
         /// 鍠滅埍
@@ -862,414 +883,412 @@
         public static readonly int Favorite = 100000;
 
 
-        public static readonly int OK = 10005;
+		public static readonly int OK = 10005;
 
-        public static readonly int AccountOrPasswordCanNotBeEmpty = 10006;
+		public static readonly int AccountOrPasswordCanNotBeEmpty = 10006;
 
-        public static readonly int IncorrectMailboxformat = 10008;
-        public static readonly int PasswordLengthIsLessThanSix = 10009;
-        
+		public static readonly int IncorrectMailboxformat = 10008;
+		public static readonly int PasswordLengthIsLessThanSix = 10009;
 
-        public static readonly int ThePasswordIsEmpty = 10011;
-        public static readonly int PleaseGoToTheMailboxToActivateTheAccountNumber = 10012;
-        public static readonly int PleaseInputTheCorrectCellPhoneNumber = 10013;
-        public static readonly int PleaseInputTheCorrectVerificationCode = 10014;
-        public static readonly int PleaseSelectAreaCode = 10015;
-  
-        public static readonly int ThePhoneNumberIsNotRegisteredYetPleaseRegisterFirst = 10017;
-        public static readonly int LoginCodeError = 10018;
-        public static readonly int ThisUserBelongsToDebugAccountAndIsNotEnabled = 10019;
-        public static readonly int PleaseGoToTheMailboxToConfirmThePasswordChange = 10020;
 
-        public static readonly int MailDeliveryFailedPleaseTryAgain = 10021;
-        public static readonly int TheAccountIsNotAuthorized = 10022;
-        public static readonly int Version = 10023;
-        public static readonly int QuitAccount = 10024;
-        public static readonly int InputNewPWD = 10025;
-        public static readonly int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10026;
-        public static readonly int ResidentialNameCannotBeEmpty = 10027;
-        public static readonly int TheResidenceNameHasExist = 10028;
-        public static readonly int DelResidence = 10029;
-        public static readonly int PWDCannotBeNull = 10030;
+		public static readonly int ThePasswordIsEmpty = 10011;
+		public static readonly int PleaseGoToTheMailboxToActivateTheAccountNumber = 10012;
+		public static readonly int PleaseInputTheCorrectCellPhoneNumber = 10013;
+		public static readonly int PleaseInputTheCorrectVerificationCode = 10014;
+		public static readonly int PleaseSelectAreaCode = 10015;
 
-        public static readonly int AddRoomBackgroundPicture = 10031;
-        public static readonly int TheRoomNameCannotBeNUll = 10032;
-        public static readonly int TheResidenceNameNull = 10033;
+		public static readonly int ThePhoneNumberIsNotRegisteredYetPleaseRegisterFirst = 10017;
+		public static readonly int LoginCodeError = 10018;
+		public static readonly int ThisUserBelongsToDebugAccountAndIsNotEnabled = 10019;
+		public static readonly int PleaseGoToTheMailboxToConfirmThePasswordChange = 10020;
+
+		public static readonly int MailDeliveryFailedPleaseTryAgain = 10021;
+		public static readonly int TheAccountIsNotAuthorized = 10022;
+		public static readonly int Version = 10023;
+		public static readonly int QuitAccount = 10024;
+		public static readonly int InputNewPWD = 10025;
+		public static readonly int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10026;
+		public static readonly int ResidentialNameCannotBeEmpty = 10027;
+		public static readonly int TheResidenceNameHasExist = 10028;
+		public static readonly int DelResidence = 10029;
+		public static readonly int PWDCannotBeNull = 10030;
+
+		public static readonly int AddRoomBackgroundPicture = 10031;
+		public static readonly int TheRoomNameCannotBeNUll = 10032;
+		public static readonly int TheResidenceNameNull = 10033;
 
 
 
-        public static readonly int PleaseInputPhoneNumberOrEmail = 11000;
-        
-        //*****public static readonly int ForgotPassword = 11002;
-       
+		public static readonly int PleaseInputPhoneNumberOrEmail = 11000;
 
-        public static readonly int Account = 11005;
-        public static readonly int RegisterByPhone = 11006;
-        public static readonly int RegisterByEmail = 11007;
-        public static readonly int LoginHadAccountPWD = 11008;
+		//*****public static readonly int ForgotPassword = 11002;
 
-  
-        public static readonly int PleaseInputVerificationCode = 11011;
+
+		public static readonly int Account = 11005;
+		public static readonly int RegisterByPhone = 11006;
+		public static readonly int RegisterByEmail = 11007;
+		public static readonly int LoginHadAccountPWD = 11008;
+
+
+		public static readonly int PleaseInputVerificationCode = 11011;
 
 
 
-        public static readonly int BackToLogin = 11015;
+		public static readonly int BackToLogin = 11015;
 
-        public static readonly int FindPWDByPhone = 11017;
-        public static readonly int FindPWDByEmail = 11018;
-        public static readonly int PleaseInputThePhoneAndYouWillHaveVerificationCode = 11019;
-        public static readonly int PleaseInputTheEmailAndYouWillHaveVerificatoinCode = 11020;
-        public static readonly int ResetPWD = 11021;
-        public static readonly int ResetPWDSuccessPleaseLoginAgain = 11022;
+		public static readonly int FindPWDByPhone = 11017;
+		public static readonly int FindPWDByEmail = 11018;
+		public static readonly int PleaseInputThePhoneAndYouWillHaveVerificationCode = 11019;
+		public static readonly int PleaseInputTheEmailAndYouWillHaveVerificatoinCode = 11020;
+		public static readonly int ResetPWD = 11021;
+		public static readonly int ResetPWDSuccessPleaseLoginAgain = 11022;
 
-        public static readonly int Logining = 11024;
+		public static readonly int Logining = 11024;
 
-        public static readonly int AddRoom = 11026;
-  
+		public static readonly int AddRoom = 11026;
 
 
-        public static readonly int SettingContent = 11031;
-        public static readonly int PleaseInputRoomName = 11032;
-        public static readonly int LocalPic = 11033;
-        public static readonly int TakePhoto = 11034;
-        public static readonly int SystemPic = 11035;
 
-        public static readonly int HadSameRoom = 11037;
-        //*****public static readonly int Function = 11038;
+		public static readonly int SettingContent = 11031;
+		public static readonly int PleaseInputRoomName = 11032;
+		public static readonly int LocalPic = 11033;
+		public static readonly int TakePhoto = 11034;
+		public static readonly int SystemPic = 11035;
+
+		public static readonly int HadSameRoom = 11037;
+		//*****public static readonly int Function = 11038;
 
 
-        public static readonly int Delete = 11041;
-        public static readonly int AddFunction = 11042;
+		public static readonly int Delete = 11041;
+		public static readonly int AddFunction = 11042;
 
-        public static readonly int Light = 11044;
-        public static readonly int AddLight = 11045;
-        public static readonly int DropLight = 11046;
-        public static readonly int DownLight = 11047;
-        public static readonly int SpotLight = 11048;
-        public static readonly int DeviceName = 11049;
+		public static readonly int Light = 11044;
+		public static readonly int AddLight = 11045;
+		public static readonly int DropLight = 11046;
+		public static readonly int DownLight = 11047;
+		public static readonly int SpotLight = 11048;
+		public static readonly int DeviceName = 11049;
 
 
-        public static readonly int ConfirmAdd = 11052;
+		public static readonly int ConfirmAdd = 11052;
 
-        public static readonly int Add = 11054;
-        public static readonly int DeviceSetting = 11055;
+		public static readonly int Add = 11054;
+		public static readonly int DeviceSetting = 11055;
 
-        public static readonly int AddDeviceSuccess = 11058;
+		public static readonly int AddDeviceSuccess = 11058;
 
-        public static readonly int Device = 11060;
-  
-        public static readonly int ConfirmDeleteThisRoom = 11062;
+		public static readonly int Device = 11060;
 
-  
- 
+		public static readonly int ConfirmDeleteThisRoom = 11062;
 
 
 
 
 
-        public static readonly int NextStep = 11071;
-        public static readonly int SelectRoom = 11072;
-        public static readonly int SelectDevice = 11073;
-
-        /// <summary>
-        /// 璋冨厜
-        /// </summary>
-        public static readonly int Dimming = 11075;
-        public static readonly int ThisSceneHadTheDevice = 11076;
-        public static readonly int SceneNameCannotBeNull = 11077;
-        public static readonly int ModifyScene = 11078;
 
 
-        /// <summary>
-        /// 鏈縺娲�
-        /// </summary>
-        public static readonly int NOTVERIFY = 11081;
-        /// <summary>
-        /// 璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
-        /// </summary>
-        public static readonly int NOTENABLE = 11082;
-        /// <summary>
-        /// //鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
-        /// </summary>
-        public static readonly int YOUDATANOISLOCALREGION = 11083;
-        /// <summary>
-        /// 璐﹀彿鎴栧瘑鐮侀敊璇�
-        /// </summary>
-        public static readonly int USERNAMEORPWDERROR = 11084;
-        /// <summary>
-        /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
-        /// </summary>
-        public static readonly int ACCOUNTNOEXISTS = 11085;
 
-       
-        public static readonly int YourPWDIsTooSample = 11088;
-        public static readonly int PleaseInputTheCorrectEmail = 11089;
-        /// <summary>
-        /// 鎿嶄綔澶辫触
-        /// </summary>
-        public static readonly int FAIL = 11090;
-        /// <summary>
-        /// 鍙戦�侀獙璇佺爜澶辫触
-        /// </summary>
-        public static readonly int SENDFAIL = 11091;
-        /// <summary>
-        /// 杩炴帴缃戝叧鎴栬�呰幏鍙栨暟鎹け璐�
-        /// </summary>
-        public static readonly int ConnectGWFail = 11092;
-        /// <summary>
-        /// 鏃堕棿闂撮殧
-        /// </summary>
-        public static readonly int TimeSpan = 11093;
-        public static readonly int TheSceneHadExist = 11094;
-        public static readonly int AddSceneFail = 11095;
+		public static readonly int NextStep = 11071;
+		public static readonly int SelectRoom = 11072;
+		public static readonly int SelectDevice = 11073;
 
-        /// <summary>
-        /// 鑷畾涔�
-        /// </summary>
-        public static readonly int Custom = 11098;
+		/// <summary>
+		/// 璋冨厜
+		/// </summary>
+		public static readonly int Dimming = 11075;
+		public static readonly int ThisSceneHadTheDevice = 11076;
+		public static readonly int SceneNameCannotBeNull = 11077;
+		public static readonly int ModifyScene = 11078;
 
-        /// <summary>
-        /// 鍙栨秷鏀惰棌
-        /// </summary>
-        public static readonly int CancelCollect = 11101;
-        /// <summary>
-        /// 淇敼淇℃伅
-        /// </summary>
-        public static readonly int ChangeDeviceInfo = 11102;
-        /// <summary>
-        /// 鐧惧垎姣�
-        /// </summary>
-        public static readonly int Percent = 11103;
-        public static readonly int Success = 11104;
-      
-        /// <summary>
-        /// The please confirm new password.
-        /// </summary>
-        public readonly static int PleaseConfirmNewPassword = 11106;
-        /// <summary>
-        /// 楠岃瘉鐮佸け鏁�
-        /// </summary>
-        public readonly static int NORECORD = 11107;
 
-        public static readonly int TheMainGatewayIsNotOnLine = 12000;
-        /// <summary>
-        /// 澶辫触锛岃閲嶈瘯
-        /// </summary>
-        public static readonly int FailedPleaseTryAgain = 12001;
-        public static readonly int TheSceneIsNull = 12002;
-        /// <summary>
-        /// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
-        /// </summary>
-        public static readonly int ThisSceneHaveNoDevice = 12003;
-        public static readonly int TheAppVersionIsNewest = 12004;
-        public static readonly int Update = 12005;
-        public static readonly int UpdateContent = 12006;
-        public static readonly int UpdateAppFail = 12007;
-        public static readonly int ControlSceneFail = 12008;
-        public static readonly int DeleteSceneFail = 12009;
-        public static readonly int SaveTheNewRoomOrNo = 12010;
-        public static readonly int Updating = 12011;
-        public static readonly int CancelUpdating = 12012;
-        /// <summary>
-        /// 鏂瑰悜涓庨檺浣�
-        /// </summary>
-        public static readonly int DirectionLimit = 12013;
-        /// <summary>
-        /// 缁存姢妯″紡
-        /// </summary>
-        public static readonly int MaintenanceMode = 12014;
-        /// <summary>
-        /// 鍚姩/绂佹鎵嬫媺寮�鍏�
-        /// </summary>
-        public static readonly int Start_Forbid_Hand_Pull_Switch=12015;
-        /// <summary>
-        /// 璧峰鏂瑰悜
-        /// </summary>
-        public static readonly int InitialDirection = 12016;
-        /// <summary>
-        /// 姝e悜
-        /// </summary>
-        public static readonly int ForwardDirection = 12017;
-        /// <summary>
-        /// 鍙嶅悜
-        /// </summary>
-        public static readonly int ReverseDirection = 12018;
-        /// <summary>
-        /// 闄愪綅
-        /// </summary>
-        public static readonly int Limit = 12019;
-        /// <summary>
-        /// 寮�濮�
-        /// </summary>
-        public static readonly int Start = 12020;
-        /// <summary>
-        /// 缁撴潫
-        /// </summary>
-        public static readonly int End = 12021;
-        /// <summary>
-        /// 鎭㈠琛岀▼璁剧疆
-        /// </summary>
-        public static readonly int RestoreTravelSettings = 12022;
-        /// <summary>
-        /// 鎭㈠琛岀▼璁剧疆鍚庯紝褰撳墠璁剧疆灏嗚鍒濆鍖栵紝纭畾缁х画鍚楋紵
-        /// </summary>
-        public static readonly int IsCancelRestoreTravelSettings = 12023;
-        /// <summary>
-        /// 鍒囨崲缁存姢妯″紡澶辫触
-        /// </summary>
-        public static readonly int ChangeMaintenanceMode_Fail = 12024;
-        /// <summary>
-        /// 鏄惁璁剧疆褰撳墠浣嶇疆涓哄紑濮嬮檺浣嶏紵
-        /// </summary>
-        public static readonly int SettingStartLimit = 12025;
-        /// <summary>
-        /// 鏄惁璁剧疆褰撳墠浣嶇疆涓虹粨鏉熼檺浣嶏紵
-        /// </summary>
-        public static readonly int SettingEndLimit = 12026;
-        /// <summary>
-        /// 璁剧疆寮�濮嬮檺浣�
-        /// </summary>
-        public static readonly int SetStartLimit = 12027;
-        /// <summary>
-        /// 璁剧疆缁撴潫闄愪綅
-        /// </summary>
-        public static readonly int SetEndLimit = 12028;
-        /// <summary>
-        /// 瀵艰建绉诲姩涓紝璇风瓑寰呫�傘�傘��
-        /// </summary>
-        public static readonly int PleaseWaitWhileTheGuidewayIsMoving = 12029;
-        /// <summary>
-        /// 鎮ㄧ殑璐﹀彿宸插湪鍙︿竴鍙拌澶囩櫥褰曪紝鎮ㄥ凡琚己鍒朵笅绾�
-        /// </summary>
-        public static readonly int YouHaveBeenSignOut = 12030;
-   
-        /// <summary>
-        /// 鍦烘櫙涓凡鍖呭惈璇ュ満鏅�
-        /// </summary>
-        public static readonly int ThisSceneHadTheScene = 12032;
-        /// <summary>
-        /// 褰撳墠娌℃悳绱㈠埌缃戝叧锛岃鍏堟坊鍔犵綉鍏�
-        /// </summary>
-        public static readonly int NoGateway = 12033;
-        /// <summary>
-        ///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
-        /// </summary>
-        public static readonly int NoDeviceCanAddToRoom = 12034;
-        /// <summary>
-        /// 閫夋嫨椋庨��
-        /// </summary>
-        public static readonly int SelectFanMode = 12035;
-        /// <summary>
-        /// 浣庨
-        /// </summary>
-        public static readonly int Fan_Low = 12036;
-        /// <summary>
-        /// 涓
-        /// </summary>
-        public static readonly int Fan_Middle = 12037;
-        /// <summary>
-        /// 楂橀
-        /// </summary>
-        public static readonly int Fan_Height = 12038;
-        /// <summary>
-        /// 閫夋嫨妯″紡
-        /// </summary>
-        public static readonly int SelectMode = 12039;
-        /// <summary>
-        /// 鑷姩
-        /// </summary>
-        public static readonly int Mode_Auto = 12040;
-        /// <summary>
-        /// 鍒跺喎
-        /// </summary>
-        public static readonly int Mode_Cool = 12041;
-        /// <summary>
-        /// 鍒剁儹
-        /// </summary>
-        public static readonly int Mode_Heat = 12042;
-        /// <summary>
-        /// 闄ゆ箍
-        /// </summary>
-        public static readonly int Mode_Dry = 12043;
-        /// <summary>
-        /// 閫侀
-        /// </summary>
-        public static readonly int Mode_FanOnly = 12044;
-        /// <summary>
-        /// 瀹ゆ俯
-        /// </summary>
-        public static readonly int IndoorTemperature = 12045;
-        /// <summary>
-        /// 绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
-        /// </summary>
-        public static readonly int TheACIsClose = 12046;
-        /// <summary>
-        /// 璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
-        /// </summary>
-        public static readonly int TheRoomIsSharedNotAllowedToOperate = 12047;
+		/// <summary>
+		/// 鏈縺娲�
+		/// </summary>
+		public static readonly int NOTVERIFY = 11081;
+		/// <summary>
+		/// 璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
+		/// </summary>
+		public static readonly int NOTENABLE = 11082;
+		/// <summary>
+		/// //鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
+		/// </summary>
+		public static readonly int YOUDATANOISLOCALREGION = 11083;
+		/// <summary>
+		/// 璐﹀彿鎴栧瘑鐮侀敊璇�
+		/// </summary>
+		public static readonly int USERNAMEORPWDERROR = 11084;
+		/// <summary>
+		/// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+		/// </summary>
+		public static readonly int ACCOUNTNOEXISTS = 11085;
 
-        #region  璁惧绫诲瀷
-        /// <summary>
-        /// 鏈煡璁惧
-        /// </summary>
-        public static readonly int UnknowDevice = 12100;
-        /// <summary>
-        /// 鎺у埗闈㈡澘
-        /// </summary>
-        public static readonly int OnOffSwitch = 12101;
-        /// <summary>
-        /// 缁х數鍣�
-        /// </summary>
-        public static readonly int OnOffOutput = 12102;
-        /// <summary>
-        /// 璋冨厜鐏�
-        /// </summary>
-        public static readonly int DimmableLight = 12103;
-        /// <summary>
-        /// 绐楀笜
-        /// </summary>
-        public static readonly int WindowCoveringDevice = 12104;
-        /// <summary>
-        /// 绌鸿皟
-        /// </summary>
-        public static readonly int Thermostat = 12105;
-        /// <summary>
-        /// 浼犳劅鍣�
-        /// </summary>
-        public static readonly int IASZone = 12106;
-        /// <summary>
-        /// 绌烘皵寮�鍏�
-        /// </summary>
-        public static readonly int AirSwitch = 12107;
-        /// <summary>
-        /// 褰╃伅
-        /// </summary>
-        public static readonly int ColorDimmableLight = 12108;
-        /// <summary>
-        /// 涓户鍣�
-        /// </summary>
-        public static readonly int Repeater = 12109;
 
-        #endregion
+		public static readonly int YourPWDIsTooSample = 11088;
+		public static readonly int PleaseInputTheCorrectEmail = 11089;
+		/// <summary>
+		/// 鎿嶄綔澶辫触
+		/// </summary>
+		public static readonly int FAIL = 11090;
+		/// <summary>
+		/// 鍙戦�侀獙璇佺爜澶辫触
+		/// </summary>
+		public static readonly int SENDFAIL = 11091;
+		/// <summary>
+		/// 杩炴帴缃戝叧鎴栬�呰幏鍙栨暟鎹け璐�
+		/// </summary>
+		public static readonly int ConnectGWFail = 11092;
+		/// <summary>
+		/// 鏃堕棿闂撮殧
+		/// </summary>
+		public static readonly int TimeSpan = 11093;
+		public static readonly int TheSceneHadExist = 11094;
+		public static readonly int AddSceneFail = 11095;
 
-        /// <summary>
-        /// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
-        /// </summary>
-        public static readonly int TheRoomNoDeviceAddToScene = 12500;
+		/// <summary>
+		/// 鑷畾涔�
+		/// </summary>
+		public static readonly int Custom = 11098;
 
-        /// <summary>
-        /// 寰�涓婄Щ鍔�
-        /// </summary>
-        public static readonly int RollerShadeUp = 12501;
-        /// <summary>
-        /// 寰�涓嬬Щ鍔�
-        /// </summary>
-        public static readonly int RollerShadeDown = 12502;
+		/// <summary>
+		/// 鍙栨秷鏀惰棌
+		/// </summary>
+		public static readonly int CancelCollect = 11101;
+		/// <summary>
+		/// 淇敼淇℃伅
+		/// </summary>
+		public static readonly int ChangeDeviceInfo = 11102;
+		/// <summary>
+		/// 鐧惧垎姣�
+		/// </summary>
+		public static readonly int Percent = 11103;
+		public static readonly int Success = 11104;
 
-        /// <summary>
-        /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
-        /// </summary>
-        public const int PswLengthMsg = 15000;
+		/// <summary>
+		/// The please confirm new password.
+		/// </summary>
+		public readonly static int PleaseConfirmNewPassword = 11106;
+		/// <summary>
+		/// 楠岃瘉鐮佸け鏁�
+		/// </summary>
+		public readonly static int NORECORD = 11107;
+
+		public static readonly int TheMainGatewayIsNotOnLine = 12000;
+		/// <summary>
+		/// 澶辫触锛岃閲嶈瘯
+		/// </summary>
+		public static readonly int FailedPleaseTryAgain = 12001;
+		public static readonly int TheSceneIsNull = 12002;
+		/// <summary>
+		/// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
+		/// </summary>
+		public static readonly int ThisSceneHaveNoDevice = 12003;
+		public static readonly int TheAppVersionIsNewest = 12004;
+		public static readonly int Update = 12005;
+		public static readonly int UpdateContent = 12006;
+		public static readonly int UpdateAppFail = 12007;
+		public static readonly int ControlSceneFail = 12008;
+		public static readonly int DeleteSceneFail = 12009;
+		public static readonly int SaveTheNewRoomOrNo = 12010;
+		public static readonly int Updating = 12011;
+		public static readonly int CancelUpdating = 12012;
+		/// <summary>
+		/// 鏂瑰悜涓庨檺浣�
+		/// </summary>
+		public static readonly int DirectionLimit = 12013;
+		/// <summary>
+		/// 缁存姢妯″紡
+		/// </summary>
+		public static readonly int MaintenanceMode = 12014;
+		/// <summary>
+		/// 鍚姩/绂佹鎵嬫媺寮�鍏�
+		/// </summary>
+		public static readonly int Start_Forbid_Hand_Pull_Switch = 12015;
+		/// <summary>
+		/// 璧峰鏂瑰悜
+		/// </summary>
+		public static readonly int InitialDirection = 12016;
+		/// <summary>
+		/// 姝e悜
+		/// </summary>
+		public static readonly int ForwardDirection = 12017;
+		/// <summary>
+		/// 鍙嶅悜
+		/// </summary>
+		public static readonly int ReverseDirection = 12018;
+		/// <summary>
+		/// 闄愪綅
+		/// </summary>
+		public static readonly int Limit = 12019;
+		/// <summary>
+		/// 寮�濮�
+		/// </summary>
+		public static readonly int Start = 12020;
+		/// <summary>
+		/// 缁撴潫
+		/// </summary>
+		public static readonly int End = 12021;
+		/// <summary>
+		/// 鎭㈠琛岀▼璁剧疆
+		/// </summary>
+		public static readonly int RestoreTravelSettings = 12022;
+		/// <summary>
+		/// 鎭㈠琛岀▼璁剧疆鍚庯紝褰撳墠璁剧疆灏嗚鍒濆鍖栵紝纭畾缁х画鍚楋紵
+		/// </summary>
+		public static readonly int IsCancelRestoreTravelSettings = 12023;
+		/// <summary>
+		/// 鍒囨崲缁存姢妯″紡澶辫触
+		/// </summary>
+		public static readonly int ChangeMaintenanceMode_Fail = 12024;
+		/// <summary>
+		/// 鏄惁璁剧疆褰撳墠浣嶇疆涓哄紑濮嬮檺浣嶏紵
+		/// </summary>
+		public static readonly int SettingStartLimit = 12025;
+		/// <summary>
+		/// 鏄惁璁剧疆褰撳墠浣嶇疆涓虹粨鏉熼檺浣嶏紵
+		/// </summary>
+		public static readonly int SettingEndLimit = 12026;
+		/// <summary>
+		/// 璁剧疆寮�濮嬮檺浣�
+		/// </summary>
+		public static readonly int SetStartLimit = 12027;
+		/// <summary>
+		/// 璁剧疆缁撴潫闄愪綅
+		/// </summary>
+		public static readonly int SetEndLimit = 12028;
+		/// <summary>
+		/// 瀵艰建绉诲姩涓紝璇风瓑寰呫�傘�傘��
+		/// </summary>
+		public static readonly int PleaseWaitWhileTheGuidewayIsMoving = 12029;
+		/// <summary>
+		/// 鎮ㄧ殑璐﹀彿宸插湪鍙︿竴鍙拌澶囩櫥褰曪紝鎮ㄥ凡琚己鍒朵笅绾�
+		/// </summary>
+		public static readonly int YouHaveBeenSignOut = 12030;
+
+		/// <summary>
+		/// 鍦烘櫙涓凡鍖呭惈璇ュ満鏅�
+		/// </summary>
+		public static readonly int ThisSceneHadTheScene = 12032;
+		/// <summary>
+		/// 褰撳墠娌℃悳绱㈠埌缃戝叧锛岃鍏堟坊鍔犵綉鍏�
+		/// </summary>
+		public static readonly int NoGateway = 12033;
+		/// <summary>
+		///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
+		/// </summary>
+		public static readonly int NoDeviceCanAddToRoom = 12034;
+		/// <summary>
+		/// 閫夋嫨椋庨��
+		/// </summary>
+		public static readonly int SelectFanMode = 12035;
+		/// <summary>
+		/// 浣庨
+		/// </summary>
+		public static readonly int Fan_Low = 12036;
+		/// <summary>
+		/// 涓
+		/// </summary>
+		public static readonly int Fan_Middle = 12037;
+		/// <summary>
+		/// 楂橀
+		/// </summary>
+		public static readonly int Fan_Height = 12038;
+		/// <summary>
+		/// 閫夋嫨妯″紡
+		/// </summary>
+		public static readonly int SelectMode = 12039;
+		/// <summary>
+		/// 鑷姩
+		/// </summary>
+		public static readonly int Mode_Auto = 12040;
+		/// <summary>
+		/// 鍒跺喎
+		/// </summary>
+		public static readonly int Mode_Cool = 12041;
+		/// <summary>
+		/// 鍒剁儹
+		/// </summary>
+		public static readonly int Mode_Heat = 12042;
+		/// <summary>
+		/// 闄ゆ箍
+		/// </summary>
+		public static readonly int Mode_Dry = 12043;
+		/// <summary>
+		/// 閫侀
+		/// </summary>
+		public static readonly int Mode_FanOnly = 12044;
+		/// <summary>
+		/// 瀹ゆ俯
+		/// </summary>
+		public static readonly int IndoorTemperature = 12045;
+		/// <summary>
+		/// 绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
+		/// </summary>
+		public static readonly int TheACIsClose = 12046;
+		
+
+		#region  璁惧绫诲瀷
+		/// <summary>
+		/// 鏈煡璁惧
+		/// </summary>
+		public static readonly int UnknowDevice = 12100;
+		/// <summary>
+		/// 鎺у埗闈㈡澘
+		/// </summary>
+		public static readonly int OnOffSwitch = 12101;
+		/// <summary>
+		/// 缁х數鍣�
+		/// </summary>
+		public static readonly int OnOffOutput = 12102;
+		/// <summary>
+		/// 璋冨厜鐏�
+		/// </summary>
+		public static readonly int DimmableLight = 12103;
+		/// <summary>
+		/// 绐楀笜
+		/// </summary>
+		public static readonly int WindowCoveringDevice = 12104;
+		/// <summary>
+		/// 绌鸿皟
+		/// </summary>
+		public static readonly int Thermostat = 12105;
+		/// <summary>
+		/// 浼犳劅鍣�
+		/// </summary>
+		public static readonly int IASZone = 12106;
+		/// <summary>
+		/// 绌烘皵寮�鍏�
+		/// </summary>
+		public static readonly int AirSwitch = 12107;
+		/// <summary>
+		/// 褰╃伅
+		/// </summary>
+		public static readonly int ColorDimmableLight = 12108;
+		/// <summary>
+		/// 涓户鍣�
+		/// </summary>
+		public static readonly int Repeater = 12109;
+
+		#endregion
+
+		/// <summary>
+		/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
+		/// </summary>
+		public static readonly int TheRoomNoDeviceAddToScene = 12500;
+
+		/// <summary>
+		/// 寰�涓婄Щ鍔�
+		/// </summary>
+		public static readonly int RollerShadeUp = 12501;
+		/// <summary>
+		/// 寰�涓嬬Щ鍔�
+		/// </summary>
+		public static readonly int RollerShadeDown = 12502;
+
+
+		/// <summary>
+		/// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+		/// </summary>
+		public const int PswLengthMsg = 15000;
         /// <summary>
         /// 1涓皬鍐欏瓧姣�
         /// </summary>
@@ -1463,15 +1482,15 @@
         /// </summary>
         public const int uStopSearch = 15050;
         /// <summary>
-        /// 鏅鸿兘缃戝叧閰嶇疆缃戠粶涓�
+        /// 姝e湪鎼滅储缃戝叧鈥�
         /// </summary>
-        public const int uGatewaySetting = 15051;
+        public const int uGatewaySearching = 15051;
         /// <summary>
         /// 璇风◢鍊�
         /// </summary>
         public const int uPleaseWait = 15052;
         /// <summary>
-        /// 璇风‘淇濈綉鍏冲凡鐢ㄧ綉绾胯繛鎺�
+        /// 璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
         /// </summary>
         public const int ConfirmLineConnectMsg = 15053;
         /// <summary>
@@ -1507,9 +1526,9 @@
         /// </summary>
         public const int NormalTip = 15061;
         /// <summary>
-        /// 闇�閲嶆柊缁戝畾
+        /// 鎹㈢粦
         /// </summary>
-        public const int uNeedReBinding = 15062;
+        public const int uReBindAgain = 15062;
         /// <summary>
         /// 宸茬粦瀹�
         /// </summary>
@@ -2679,7 +2698,7 @@
         /// </summary>
         public const int uAppAutoBackup = 15400;
         /// <summary>
-        /// 瀛愮綉鍏�
+        /// 浠庣綉鍏�
         /// </summary>
         public const int uChidrenGateway = 15401;
         /// <summary>
@@ -2995,7 +3014,7 @@
         /// </summary>
         public const int uGetGatewayTagartFail = 15491;
         /// <summary>
-        /// 鏄惁閲嶆柊缁戝畾缃戝叧?
+        /// 纭缁戝畾鏃х綉鍏筹紵
         /// </summary>
         public const int uRebindGatewayMsg = 15492;
         /// <summary>
@@ -3263,7 +3282,7 @@
         /// </summary>
         public const int uHadSharedContent = 15564;
         /// <summary>
-        /// 鏂板鍏变韩
+        /// 鍒涘缓鏂板叡浜�
         /// </summary>
         public const int uAddShared = 15565;
         /// <summary>
@@ -3327,7 +3346,7 @@
         /// </summary>
         public const int uCanNotAddDeviceInGarrisonMode = 15582;
         /// <summary>
-        /// 鍏ㄩ儴鍖哄煙鏃犲彲鍏变韩鐨勮澶�
+        /// 鏃犲彲鍏变韩鐨勬埧闂�
         /// </summary>
         public const int uNotShardDeviceInAllRoomMsg = 15583;
         /// <summary>
@@ -4070,6 +4089,50 @@
         /// 纭鍒犻櫎鍏变韩鎴块棿锛�
         /// </summary>
         public const int uDeleteShardRoomMsg = 15777;
+        /// <summary>
+        /// 杩樻病缁戝畾缃戝叧鍝�
+        /// </summary>
+        public const int uHadNotBindGatewayMsg = 15778;
+        /// <summary>
+        /// 瑙e喅鏂规硶锛屽彲閫夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
+        /// </summary>
+        public const int uSearchGatewayFailMsg1 = 15779;
+        /// <summary>
+        /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔剓0}鐏悗锛岄噸鏂板叆缃戙��
+        /// </summary>
+        public const int uSearchGatewayFailMsg2 = 15780;
+        /// <summary>
+        /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯{0}5绉掋��
+        /// </summary>
+        public const int uSearchGatewayFailMsg3 = 15781;
+        /// <summary>
+        /// 3.璇烽噸璇曪紝閲嶆柊娣诲姞缃戝叧銆�
+        /// </summary>
+        public const int uSearchGatewayFailMsg4 = 15782;
+        /// <summary>
+        /// 4.杩斿洖缃戝叧绠$悊銆�
+        /// </summary>
+        public const int uSearchGatewayFailMsg5 = 15783;
+        /// <summary>
+        /// 閲嶈瘯
+        /// </summary>
+        public const int uReDoAgain = 15784;
+        /// <summary>
+        /// 杩斿洖缃戝叧绠$悊
+        /// </summary>
+        public const int uGobackGatewayManage = 15785;
+        /// <summary>
+        /// 鎼滅储澶辫触
+        /// </summary>
+        public const int uSearchFail = 15786;
+        /// <summary>
+        /// (鏂�)
+        /// </summary>
+        public const int uNewTip1 = 15787;
+        /// <summary>
+        /// 姝e湪鎹㈢粦缃戝叧锛岃绋嶅�欌��
+        /// </summary>
+        public const int uIsReBindingPleaseWaiting = 15788;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>

--
Gitblit v1.8.0