From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25

---
 ZigbeeApp/Shared/R.cs |  968 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 625 insertions(+), 343 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index e922717..574b6db
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -115,7 +115,7 @@
         public readonly static int Ac = 42;
         public readonly static int SneneModeExistTargets = 43;
         //闂ㄩ攣
-        //public static readonly int FunctionSetting = 44;
+        public static readonly int DoorLockFunctionSetting = 44;
         public static readonly int RandomPasword = 45;
         public static readonly int DoolockMonth = 46;
         public static readonly int DoorlockDay = 47;
@@ -272,7 +272,7 @@
         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 SetTempPasswordTip = 188;
         public readonly static int SetTempPasswordTip3 = 189;
         public readonly static int SetTempPasswordTip4 = 190;
         public readonly static int SetTempPasswordTip5 = 191;
@@ -288,6 +288,25 @@
         public readonly static int ModifyTempPasswordTip2 = 201;
         public readonly static int FirstFloor = 202;
         public readonly static int GwResponseOvertime = 203;
+        public readonly static int CloudServerResponseOvertime = 204;
+        public readonly static int SureToFreezeAccount = 205;
+        public readonly static int FreezeFailed = 206;
+        public readonly static int UnFreezeFailed = 207;
+        public readonly static int DoorLockShare = 208;
+        public readonly static int EntryCurrentUnlockMethod = 209;
+        public readonly static int SureGiveAccessToSubaccount = 210;
+        public readonly static int CancelAccessToSubaccountFailed = 211;
+        public readonly static int GiveAccessToSubaccountFailed = 212;
+        public readonly static int AccountIsFreezed = 213;
+        public readonly static int NoAccess = 214;
+        public readonly static int NoFiftySeconds = 215;
+        public readonly static int VerifyFailed = 216;
+        public readonly static int UnlockSuccess = 217;
+        public readonly static int AddFailed = 218;
+        public readonly static int UnlockFailed = 219;
+        public readonly static int DoorlockPasswordDispear = 220;
+        public readonly static int BindUnknownError = 221;
+        public readonly static int OffLineScene = 222;
 
         public readonly static int RemindSetting = 548;
         public readonly static int AddNewUser = 650;
@@ -556,11 +575,16 @@
         public readonly static int selecfoolr = 5368;
 
 
-		#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 Favorite = 10001;
+
 
 
 		/// <summary>
@@ -627,20 +651,20 @@
 		/// 纭畾
 		/// </summary>
 		public const int Confrim = 10115;
-		/// <summary>
-		/// 璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍
-		/// </summary>
-		public const int AccountHasBeenRegistered = 10116;
+        /// <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 TwoPasswordInconsistency = 10118;
-		/// <summary>
-		/// 楠岃瘉鐮侀敊璇�
+		/// 楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
 		/// </summary>
 		public const int VALIDCODEANDPHONENOEQUAL = 10119;
 		/// <summary>
@@ -692,7 +716,7 @@
         /// </summary>
         public const int USERNAMEORPWDERROR = 10131;
         /// <summary>
-        /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+        /// 璐﹀彿涓嶅瓨鍦紝璇锋敞鍐岀敤鎴�
         /// </summary>
         public const int ACCOUNTNOEXISTS = 10132;
         /// <summary>
@@ -703,16 +727,128 @@
         /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
         /// </summary>
         public const int LoginByWechat = 10134;
+        /// <summary>
+        /// 鐧诲綍涓�...
+        /// </summary>
+        public const int Logining = 10135;
+        /// <summary>
+        /// 褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
+        /// </summary>
+        public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
+        /// <summary>
+        /// 浣忓畢鍚嶇О涓虹┖
+        /// </summary>
+        public const int TheResidenceNameNull = 10137;
+        /// <summary>
+        /// 閭閿欒锛岃閲嶆柊杈撳叆
+        /// </summary>
+        public const int TheEmailError = 10138;
+        /// <summary>
+        /// 鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
+        /// </summary>
+        public const int ThePhoneError = 10139;
+        /// <summary>
+        /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
+        /// </summary>
+        public const int ThePWDLengthError = 10140;
+        /// <summary>
+        /// 浣犲凡琚己鍒朵笅绾匡紒
+        /// </summary>
+        public const int YouHaveBeenSignOut = 10141;
+        /// <summary>
+        /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
+        /// </summary>
+        public const int NEWPASSWORDANDOLDPASSWORDEQUAL = 10142;
 
 
-		#endregion
+        /// <summary>
+        /// 鏀规埧闂村悕绉板凡瀛樺湪
+        /// </summary>
+		public const int HadSameRoom = 10150;
+        /// <summary>
+        /// 鍦烘櫙鍚嶄笉鑳戒负绌�
+        /// </summary>
+        public const int SceneNameCannotBeNull = 10151;
+        /// <summary>
+        /// 鎺у埗鍦烘櫙澶辫触
+        /// </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;
+        /// <summary>
+        /// 鍙戦�侀獙璇佺爜澶辫触
+        /// </summary>
+        public const int SENDFAIL = 10156;
+        /// <summary>
+        /// 缃戝叧涓嶅湪绾�
+        /// </summary>
+		public const int TheMainGatewayIsNotOnLine = 10157;
 
-		#region 鍒嗙被
 
-		/// <summary>
-		/// 鍔熻兘
-		/// </summary>
-		public const int Function = 11000;
+        /// <summary>
+        /// 宸叉槸鏈�鏂扮増鏈�
+        /// </summary>
+        public const int TheAppVersionIsNewest = 10160;
+        /// <summary>
+        /// 鏇存柊鏈�鏂扮増
+        /// </summary>
+		public const int Update = 10161;
+        /// <summary>
+        /// 鏇存柊鍐呭
+        /// </summary>
+		public const int UpdateContent = 10162;
+        /// <summary>
+        /// 鏇存柊澶辫触
+        /// </summary>
+		public const int UpdateAppFail = 10163;
+        /// <summary>
+        /// 姝e湪鏇存柊涓�...
+        /// </summary>
+		public const int Updating = 10164;
+        /// <summary>
+        /// 鍙栨秷鏇存柊
+        /// </summary>
+		public const int CancelUpdating = 10165;
+        /// <summary>
+        /// 鐗堟湰鍙�
+        /// </summary>
+        public const int VersionCode = 10166;
+        /// <summary>
+        /// 鏈嶅姟鍗忚
+        /// </summary>
+        public const int SLA = 10167;
+        /// <summary>
+        /// 鐗堟湰鏇存柊
+        /// </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>
@@ -772,7 +908,7 @@
 		/// </summary>
 		public const int Save = 11021;
 		/// <summary>
-		/// 鎻愮ず
+		/// 鎻愰啋
 		/// </summary>
 		public const int TIP = 11022;
 		/// <summary>
@@ -819,6 +955,18 @@
 		/// 閫夋嫨鍦烘櫙鍥剧墖
 		/// </summary>
 		public const int SelectScenePic = 11033;
+        /// <summary>
+        /// 纭畾瑕佺Щ闄よ鍔熻兘锛�
+        /// </summary>
+        public const int DeleteFunction = 11034;
+        /// <summary>
+        /// 娣诲姞鍔熻兘
+        /// </summary>
+        public const int AddFunction = 11035;
+        /// <summary>
+        /// 娣诲姞寤舵椂
+        /// </summary>
+        public const int AddDelayTime = 11036;
 
         #region  璁惧绫诲瀷
         /// <summary>
@@ -857,6 +1005,53 @@
         /// 涓户鍣�
         /// </summary>
         public const int Repeater = 12109;
+        /// <summary>
+        /// 娓╁害浼犳劅鍣�
+        /// </summary>
+        public const int TemperatureSensor = 12110;
+        /// <summary>
+        /// 婀垮害浼犳劅鍣�
+        /// </summary>
+        public const int HumiditySensor = 12111;
+        /// <summary>
+        /// 娓╂箍搴︿紶鎰熷櫒
+        /// </summary>
+        public const int TemperatureAndHumiditySensor = 12112;
+
+
+        /// <summary>
+        /// 鏈変汉
+        /// </summary>
+        public const int IASZone_Statu_HavePerson = 12500;
+        /// <summary>
+        /// 鏃犱汉
+        /// </summary>
+        public const int IASZone_Statu_NoPerson = 12501;
+        /// <summary>
+        /// 婕忔按
+        /// </summary>
+        public const int IASZone_Statu_HaveWater = 12502;
+        /// <summary>
+        /// 姝e父
+        /// </summary>
+        public const int IASZone_Statu_Normal = 12503;
+        /// <summary>
+        /// 寮�鍚�
+        /// </summary>
+        public const int IASZone_Statu_Open = 12504;
+        /// <summary>
+        /// 闂悎
+        /// </summary>
+        public const int IASZone_Statu_Close = 12505;
+        /// <summary>
+        /// 鎶ヨ
+        /// </summary>
+        public const int IASZone_Statu_Alarm = 12506;
+        /// <summary>
+        /// 瀹夊叏
+        /// </summary>
+        public const int IASZone_Statu_Safe = 12507;
+
 
         #endregion
 
@@ -1062,308 +1257,71 @@
         /// 鎴戠殑鐩稿唽
         /// </summary>
         public const int MyAblums = 13148;
+        /// <summary>
+        /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
+        /// </summary>
+        public const int TheSceneIsDelaying = 13149;
+
+
+
+        /// <summary>
+        /// 閫夋嫨鎽嗛
+        /// </summary>
+        public const int SelectSwing=13500;
+        /// <summary>
+        /// 鑷姩
+        /// </summary>
+        public const int Swing_Auto = 13501;
+        /// <summary>
+        /// 1鎸�
+        /// </summary>
+        public const int Swing_First = 13502;
+        /// <summary>
+        /// 2鎸�
+        /// </summary>
+        public const int Swing_Second = 13503;
+        /// <summary>
+        /// 3鎸�
+        /// </summary>
+        public const int Swing_Thrid = 13504;
+        /// <summary>
+        /// 4鎸�
+        /// </summary>
+        public const int Swing_Fourth = 13505;
+        /// <summary>
+        /// 5鎸�
+        /// </summary>
+        public const int Swing_Fifth = 13506;
+        /// <summary>
+        /// 璇锋竻娲佹护缃�
+        /// </summary>
+        public const int NeedCleanAC = 13511;
+
+        /// <summary>
+        /// 娌″姛鑳� 璇峰厛娣诲姞
+        /// </summary>
+        public const int NoFunction_Tip = 13600;
+        /// <summary>
+        /// 娌″満鏅� 璇峰厛娣诲姞
+        /// </summary>
+        public const int NoScene_Tip = 13601;
+        /// <summary>
+        /// 鏃�
+        /// </summary>
+        public const int No = 13602;
+        /// <summary>
+        /// 鑾峰彇涓�...
+        /// </summary>
+        public const int Getting = 13603;
+
+
 
         #endregion
 
 
+        
 
 
-        /// <summary>
-        /// 鍠滅埍
-        /// </summary>
-        public static readonly int Favorite = 100000;
-
-
-		public static readonly int OK = 10005;
-
-		public static readonly int AccountOrPasswordCanNotBeEmpty = 10006;
-
-		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 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 Account = 11005;
-		public static readonly int RegisterByPhone = 11006;
-		public static readonly int RegisterByEmail = 11007;
-		public static readonly int LoginHadAccountPWD = 11008;
-
-
-		
-
-
-
-		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 Logining = 11024;
-
-		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 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 ConfirmAdd = 11052;
-
-		public static readonly int Add = 11054;
-		public static readonly int DeviceSetting = 11055;
-
-		public static readonly int AddDeviceSuccess = 11058;
-
-		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;
-
-
-		
-
-
-		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;
-       
-
-
-
-        /// <summary>
-        /// 鑷畾涔�
-        /// </summary>
-        public static readonly int Custom = 11098;
-
-		/// <summary>
-		/// 鍙栨秷鏀惰棌
-		/// </summary>
-		public static readonly int CancelCollect = 11101;
-		/// <summary>
-		/// 淇敼淇℃伅
-		/// </summary>
-		public static readonly int ChangeDeviceInfo = 11102;
-		/// <summary>
-		/// 鐧惧垎姣�
-		/// </summary>
-		public static readonly int Percent = 11103;
-
-
-		/// <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;
-
-		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 TheRoomNoDeviceAddToScene = 12500;
-
-		/// <summary>
-		/// 寰�涓婄Щ鍔�
-		/// </summary>
-		public static readonly int RollerShadeUp = 12501;
-		/// <summary>
-		/// 寰�涓嬬Щ鍔�
-		/// </summary>
-		public static readonly int RollerShadeDown = 12502;
 
 
 		/// <summary>
@@ -1666,10 +1624,6 @@
         /// 绐楀笜鐢垫満
         /// </summary>
         public const int uCurtainMotor = 15079;
-        /// <summary>
-        /// 瀹夐槻鍔熻兘
-        /// </summary>
-        public const int uSecurityFunction = 15084;
         /// <summary>
         /// 璁惧绫诲瀷
         /// </summary>
@@ -2055,9 +2009,9 @@
         /// </summary>
         public const int uSharedDevice = 15083;
         /// <summary>
-        /// 鍏变韩鎴块棿
+        /// 鏈垎閰�
         /// </summary>
-        public const int uSharedRoom = 15084;
+        public const int uUnallocated = 15084;
         /// <summary>
         /// 閰嶇疆鍏变韩璁惧
         /// </summary>
@@ -2155,9 +2109,9 @@
         /// </summary>
         public const int uDownLoadAndRecoverMsg = 15221;
         /// <summary>
-        /// 纭畾瑕佸垹闄ゆ枃浠跺悧锛�
+        /// 纭鍒犻櫎璇ュ浠芥暟鎹�?
         /// </summary>
-        public const int uDoDeleteFileMsg = 15222;
+        public const int uDoDeleteBackupMsg = 15222;
         /// <summary>
         /// 娣诲姞澶囦唤
         /// </summary>
@@ -3203,9 +3157,9 @@
         /// </summary>
         public const int uGatewayType = 15520;
         /// <summary>
-        /// 璁惧纭欢鐗堟湰
+        /// 纭欢鐗堟湰
         /// </summary>
-        public const int uDeviceHardwareVersion = 15521;
+        public const int uHardwareVersion = 15521;
         /// <summary>
         /// 缃戝叧鍥轰欢鐗堟湰
         /// </summary>
@@ -3231,9 +3185,9 @@
         /// </summary>
         public const int uDeviceImageId = 15527;
         /// <summary>
-        /// 缃戝叧闀滃儚ID
+        /// 闀滃儚ID
         /// </summary>
-        public const int uGatewayImageId = 15528;
+        public const int uImageId = 15528;
         /// <summary>
         /// 铏氭嫙椹卞姩闀滃儚ID
         /// </summary>
@@ -3305,7 +3259,7 @@
         /// <summary>
         /// 鍥轰欢鏃ユ湡
         /// </summary>
-        public const int uGatewayHardwareDate = 15548;
+        public const int uHardwareDate = 15548;
         /// <summary>
         /// 娌℃湁鍙戠幇鏂扮綉鍏�,璇锋鏌ョ綉鍏抽摼鎺ユ槸鍚︽甯�
         /// </summary>
@@ -3523,17 +3477,9 @@
         /// </summary>
         public const int uPleaseSelectNetwork = 15614;
         /// <summary>
-        /// 鍚� 绉�
+        /// 璇疯緭鍏iFi瀵嗙爜
         /// </summary>
-        public const int uNameHadSpace = 15615;
-        /// <summary>
-        /// 瀵� 鐮�
-        /// </summary>
-        public const int uPasswordHadSpace = 15616;
-        /// <summary>
-        /// 璇疯緭鍏ョ綉缁滃瘑鐮�
-        /// </summary>
-        public const int uPleaseInputNetworkPassword = 15617;
+        public const int uPleaseInputWifiPassword = 15617;
         /// <summary>
         /// 瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
         /// </summary>
@@ -4650,6 +4596,342 @@
         /// 鑳佽揩瀵嗙爜璁剧疆鎴愬姛
         /// </summary>
         public const int uSetCoercePasswordSuccess = 15897;
+        /// <summary>
+        /// 鑾峰彇绌鸿皟妯″紡澶辫触
+        /// </summary>
+        public const int uGetAcModeFail = 15898;
+        /// <summary>
+        /// 璁剧疆绌鸿皟妯″紡澶辫触
+        /// </summary>
+        public const int uSetAcModeFail = 15899;
+        /// <summary>
+        /// 缁х画娣诲姞缃戝叧
+        /// </summary>
+        public const int uContinuteToAddGateway = 15900;
+        /// <summary>
+        /// 杩斿洖涓婚〉
+        /// </summary>
+        public const int uGobackToHomePage = 15901;
+        /// <summary>
+        /// 娣诲姞鏅鸿兘缃戝叧鎴愬姛
+        /// </summary>
+        public const int uAddgatewaySuccess = 15902;
+        /// <summary>
+        /// UDP妯″紡(鎺ㄨ崘)
+        /// </summary>
+        public const int uUdpModeRecommend = 15903;
+        /// <summary>
+        /// AP妯″紡
+        /// </summary>
+        public const int uApMode = 15904;
+        /// <summary>
+        /// 璺宠浆鍒扮Щ鍔ㄨ澶�
+        /// </summary>
+        public const int uJumpToMobileDevice= 15905;
+        /// <summary>
+        /// WLAN璁剧疆杩炴帴瀹跺涵WiFi
+        /// </summary>
+        public const int uWlanConnectHomeWifi = 15906;
+        /// <summary>
+        /// 闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+        /// </summary>
+        public const int uAddUdpWirelessGatewayMsg = 15907;
+        /// <summary>
+        /// 闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+        /// </summary>
+        public const int uAddApWirelessGatewayMsg1 = 15908;
+        /// <summary>
+        /// 璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+        /// </summary>
+        public const int uAddApWirelessGatewayMsg2 = 15909;
+        /// <summary>
+        /// 璇疯緭鍏ュ搴璚IFI璐﹀彿
+        /// </summary>
+        public const int uPleaseInputHomeWifiAccount = 15910;
+        /// <summary>
+        /// 璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
+        /// </summary>
+        public const int uAddApWirelessGatewayMsg3 = 15911;
+        /// <summary>
+        /// 绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+        /// </summary>
+        public const int uAddApWirelessGatewayMsg4 = 15912;
+        /// <summary>
+        /// 閫夋嫨鍦扮偣
+        /// </summary>
+        public const int uSelectAdrress = 15915;
+        /// <summary>
+        /// 鎮ㄧ殑鍙嶉鍜屾剰瑙佷細璁╂垜浠彉寰楁洿濂�
+        /// </summary>
+        public const int uYouSuggestionMsg = 15916;
+        /// <summary>
+        /// 鍙嶉绫诲瀷
+        /// </summary>
+        public const int uSuggestionType = 15917;
+        /// <summary>
+        /// 浼樺寲
+        /// </summary>
+        public const int uOptimization = 15918;
+        /// <summary>
+        /// 鏂伴渶姹�
+        /// </summary>
+        public const int uNewDemand = 15919;
+        /// <summary>
+        /// 閭鍦板潃
+        /// </summary>
+        public const int uEmailAddress = 15920;
+        /// <summary>
+        /// 璇疯緭鍏ユ偍鐨勯偖绠卞湴鍧�
+        /// </summary>
+        public const int uPleaseInputYouEmailAddress = 15921;
+        /// <summary>
+        /// 鎻愪氦
+        /// </summary>
+        public const int uSubmit = 15922;
+        /// <summary>
+        /// 鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+        /// </summary>
+        public const int uSubmitSuccessMsg = 15923;
+        /// <summary>
+        /// 涓婁紶
+        /// </summary>
+        public const int uUpload = 15924;
+        /// <summary>
+        /// 鑷姩澶囦唤
+        /// </summary>
+        public const int uAutoBackup = 15925;
+        /// <summary>
+        /// 浠婃棩鎻愪氦娆℃暟宸蹭笂闄�
+        /// </summary>
+        public const int uSubmitCountIsOverMsg = 15926;
+        /// <summary>
+        /// 鑾峰彇缃戝叧淇¢亾澶辫触
+        /// </summary>
+        public const int uGetGatewayChannelIdFail = 15927;
+        /// <summary>
+        /// 鑾峰彇鍗忚皟鍣∕ac澶辫触
+        /// </summary>
+        public const int uGetGatewayCoordinatorMacFail = 15928;
+        /// <summary>
+        /// 鑾峰彇鍗忚皟鍣≒anID澶辫触
+        /// </summary>
+        public const int uGetGatewayPanIDFail = 15929;
+        /// <summary>
+        /// 涓婁紶鏁版嵁鑷充簯绔�
+        /// </summary>
+        public const int uUploadDataToDb = 15930;
+        /// <summary>
+        /// 浠庝簯绔笅杞芥暟鎹�
+        /// </summary>
+        public const int uDwonloadDataFromDb = 15931;
+        /// <summary>
+        /// 涓婁紶鏁版嵁
+        /// </summary>
+        public const int uUploadData = 15932;
+        /// <summary>
+        /// 涓婁紶鏁版嵁鎴愬姛
+        /// </summary>
+        public const int uUploadDataSuccess = 15933;
+        /// <summary>
+        /// 涓嬭浇鏁版嵁
+        /// </summary>
+        public const int uDwonloadData = 15934;
+        /// <summary>
+        /// 涓嬭浇
+        /// </summary>
+        public const int uDownLoad = 15935;
+        /// <summary>
+        /// 璁剧疆缃戝叧缁忕含搴﹀け璐�
+        /// </summary>
+        public const int uSetGatewaySiteFail = 15936;
+        /// <summary>
+        /// 姝e湪淇濆瓨鍗忚皟鍣╪v鍒嗗尯淇℃伅
+        /// </summary>
+        public const int uGatewayNVFileSaving = 15937;
+        /// <summary>
+        /// 淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅澶辫触
+        /// </summary>
+        public const int uSaveGatewayNVFileFail = 15938;
+        /// <summary>
+        /// 鎵撳紑鍗忚皟鍣ㄤ覆鍙e彂閫佸姛鑳藉け璐�
+        /// </summary>
+        public const int uOpenZbMsComSendFail = 15939;
+        /// <summary>
+        /// 缃戝叧鏁版嵁澶囦唤澶辫触
+        /// </summary>
+        public const int uBackupgatewayDataFail = 15940;
+        /// <summary>
+        /// 寮�濮嬪浠界綉鍏虫暟鎹�
+        /// </summary>
+        public const int uStartBackupgatewayData = 15941;
+        /// <summary>
+        /// 鍝嶅簲瓒呮椂,缃戝叧鏁版嵁澶囦唤澶辫触
+        /// </summary>
+        public const int uResponseTimeoutsAndBackupgatewayDataFail = 15942;
+        /// <summary>
+        /// 鍒涘缓澶囦唤鏂囦欢
+        /// </summary>
+        public const int uCreatBackupFile = 15943;
+        /// <summary>
+        /// 姝e湪鎵撳紑鍗忚皟鍣ㄤ覆鍙e彂閫佸姛鑳�
+        /// </summary>
+        public const int uZbMsComSendOpening = 15944;
+        /// <summary>
+        /// 鑾峰彇缃戝叧鑷姩澶囦唤璁剧疆澶辫触
+        /// </summary>
+        public const int uGetGatewayAutoBackupStatuFail = 15945;
+        /// <summary>
+        /// 璁剧疆缃戝叧鑷姩澶囦唤澶辫触
+        /// </summary>
+        public const int uSetGatewayAutoBackupStatuFail = 15946;
+        /// <summary>
+        /// 姝e湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
+        /// </summary>
+        public const int uBackupFileListGetting = 15947;
+        /// <summary>
+        /// 鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+        /// </summary>
+        public const int uGetBackupFileListFail = 15948;
+        /// <summary>
+        /// 鍝嶅簲瓒呮椂,鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+        /// </summary>
+        public const int uResponseTimeoutsAndGetBackupFileListFail = 15949;
+        /// <summary>
+        /// 姝e湪涓嬭浇澶囦唤鏂囦欢
+        /// </summary>
+        public const int uBackupFileDownloading = 15950;
+        /// <summary>
+        /// 鍝嶅簲瓒呮椂,涓嬭浇澶囦唤鏂囦欢澶辫触
+        /// </summary>
+        public const int uResponseTimeoutsAndDownloadBackupFileFail = 15951;
+        /// <summary>
+        /// 涓嬭浇澶囦唤鏂囦欢澶辫触
+        /// </summary>
+        public const int uDownloadBackupFileFail = 15952;
+        /// <summary>
+        /// 姝e湪鎭㈠鍗忚皟鍣╪v鍒嗗尯
+        /// </summary>
+        public const int uGatewayNVRestoring = 15953;
+        /// <summary>
+        /// 鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+        /// </summary>
+        public const int uRestoreGatewayNVFail = 15954;
+        /// <summary>
+        /// 鍝嶅簲瓒呮椂,鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+        /// </summary>
+        public const int uResponseTimeoutsAndRestoreGatewayNVFail = 15955;
+        /// <summary>
+        /// 姝e湪閲嶅惎缃戝叧绯荤粺
+        /// </summary>
+        public const int uGatewayRerooting = 15956;
+        /// <summary>
+        /// 閲嶅惎缃戝叧绯荤粺澶辫触
+        /// </summary>
+        public const int uGatewayRerootFail = 15957;
+        /// <summary>
+        /// 鍝嶅簲瓒呮椂,閲嶅惎缃戝叧绯荤粺澶辫触
+        /// </summary>
+        public const int uResponseTimeoutsAndGatewayRerootFail = 15958;
+        /// <summary>
+        /// 缃戝叧鏁版嵁鎭㈠鎴愬姛!
+        /// </summary>
+        public const int uRestoreGatewayDataSuccess = 15959;
+        /// <summary>
+        /// 铏氭嫙椹卞姩璁惧
+        /// </summary>
+        public const int uVirtualDriveDevice = 15960;
+        /// <summary>
+        /// 瀵嗙爜寮�閿佹垚鍔�
+        /// </summary>
+        public const int uUnlockByPasswordSuccess = 15961;
+        /// <summary>
+        /// 瀵嗙爜寮�閿佸け璐�
+        /// </summary>
+        public const int uUnlockByPasswordFail = 15962;
+        /// <summary>
+        /// 鎸囩汗寮�閿佹垚鍔�
+        /// </summary>
+        public const int uUnlockByFingerPrintSuccess = 15963;
+        /// <summary>
+        /// 鎸囩汗寮�閿佸け璐�
+        /// </summary>
+        public const int uUnlockByFingerPrintFail = 15964;
+        /// <summary>
+        /// IC鍗″紑閿佹垚鍔�
+        /// </summary>
+        public const int uUnlockByICcardSuccess = 15965;
+        /// <summary>
+        /// IC鍗″紑閿佸け璐�
+        /// </summary>
+        public const int uUnlockByICcardFail = 15966;
+        /// <summary>
+        /// 寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂�
+        /// </summary>
+        public const int uFromTimeIsOverToTime = 15967;
+        /// <summary>
+        /// 纭畾瑕佽В闄ょ粦瀹歿0}锛�
+        /// </summary>
+        public const int uComfirmUnBindedMsg = 15968;
+        /// <summary>
+        /// 鏇存柊绗笁鏂逛俊鎭け璐�
+        /// </summary>
+        public const int uUpdateOtherPartyInfoFail = 15969;
+        /// <summary>
+        /// 缁戝畾{0}鎴愬姛!
+        /// </summary>
+        public const int uBindSomethingSuccess = 15970;
+        /// <summary>
+        /// 閿欒,绗笁鏂逛俊鎭涪澶�
+        /// </summary>
+        public const int uErrorAndLostOtherPatyInfo = 15971;
+        /// <summary>
+        /// 鎮ㄥ綋鍓嶇殑IP鍙婄鍙e湪浜戠涓嶅瓨鍦�,璇烽噸鏂扮櫥褰�!
+        /// </summary>
+        public const int uYouIpAndPortNoRecord = 15972;
+        /// <summary>
+        /// 娑堟伅涓績
+        /// </summary>
+        public const int uMessageCenter = 15973;
+        /// <summary>
+        /// 纭鍒犻櫎娑堟伅?
+        /// </summary>
+        public const int uDeleteMessageMsg = 15974;
+        /// <summary>
+        /// 姝e湪涓婁紶澶囦唤鏂囦欢
+        /// </summary>
+        public const int uBackupFileUploading = 15975;
+        /// <summary>
+        /// 纭鍒犻櫎鍏ㄩ儴娑堟伅?
+        /// </summary>
+        public const int uDeleteAllMessageMsg = 15976;
+        /// <summary>
+        /// 纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
+        /// </summary>
+        public const int uUnTipAllMessageMsg = 15977;
+        /// <summary>
+        /// 閫氫俊閾炬帴澶辫触
+        /// </summary>
+        public const int uCommunicationLinkFail = 15978;
+        /// <summary>
+        /// 鑾峰彇缃戠粶SSID澶辫触
+        /// </summary>
+        public const int uGetSsidFail = 15979;
+        /// <summary>
+        /// 瀵嗙爜鍙戦�佸け璐�
+        /// </summary>
+        public const int uSendPasswordFail = 15980;
+        /// <summary>
+        /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+        /// </summary>
+        public const int uPleaseSelectGatewayXXNet = 15981;
+        /// <summary>
+        /// 璇疯繛鎺ュ搴璚iFi
+        /// </summary>
+        public const int uPleaseLinkHomeWifi = 15982;
+        /// <summary>
+        /// 姝e湪鑾峰彇鍒嗕韩鏁版嵁
+        /// </summary>
+        public const int uShardContentGetting = 15983;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>

--
Gitblit v1.8.0