From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期四, 07 十一月 2019 11:58:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc --- ZigbeeApp/Shared/R.cs | 1050 ++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 652 insertions(+), 398 deletions(-) diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs index 4ec44bc..e66b63f 100644 --- a/ZigbeeApp/Shared/R.cs +++ b/ZigbeeApp/Shared/R.cs @@ -261,7 +261,7 @@ public readonly static int ModigfyFailed = 175; public readonly static int OnlyBeDeletedOnTheDevice = 176; public readonly static int Undistributed = 177; - public readonly static int AfterThirtySeconds = 178; + public readonly static int AfterFiftySeconds = 178; //闂ㄩ攣楠岃瘉瀵嗙爜澶辫触 public readonly static int OperrateFailed = 179; public readonly static int RemoteUnlockBindSucessTip1 = 180; @@ -287,6 +287,18 @@ public readonly static int ModifyTempPasswordTip1 = 200; 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 GiveAccessToSubaccountSuccess = 211; + public readonly static int GiveAccessToSubaccountFailed = 212; + public readonly static int AccountIsFreezed = 213; + public readonly static int NoAccess = 214; public readonly static int RemindSetting = 548; public readonly static int AddNewUser = 650; @@ -560,116 +572,152 @@ /// HDL Home /// </summary> public const int AppName = 10000; + /// <summary> + /// 甯哥敤 + /// </summary> + public const int Favorite = 10001; + /// <summary> + /// 鎵嬫満鍙� + /// </summary> + public const int PhoneNum = 10100; + /// <summary> + /// 閭 + /// </summary> + public const int Email = 10101; + /// <summary> + /// 璇疯緭鍏ユ墜鏈哄彿 + /// </summary> + public const int PleaseInputPhoneNum = 10102; + /// <summary> + /// 璇疯緭鍏ヤ笉灏戜簬6浣嶇殑瀵嗙爜 + /// </summary> + public const int PleaseInputPWD = 10103; + /// <summary> + /// 鐧诲綍 + /// </summary> + public const int Login = 10104; + /// <summary> + /// 楠岃瘉鐮佺櫥褰� + /// </summary> + public const int LoginByCode = 10105; + /// <summary> + /// 娉ㄥ唽鐢ㄦ埛 + /// </summary> + public const int Register = 10106; + /// <summary> + /// 璇疯緭鍏ラ偖绠� + /// </summary> + public const int PleaseInputEmail = 10107; + /// <summary> + /// 鎼滅储 + /// </summary> + public const int Search = 10108; + /// <summary> + /// 瀹屾垚 + /// </summary> + public const int Complete = 10109; + /// <summary> + /// 璐﹀彿鐧诲綍 + /// </summary> + public const int LoginByAccountPWD = 10110; + /// <summary> + /// 鍙戦�侀獙璇佺爜 + /// </summary> + public const int SendVerificationCode = 10111; + /// <summary> + /// 鍚庨噸鍙� + /// </summary> + public const int SendVerificationCodeAgain = 10112; + /// <summary> + /// 璇峰啀娆¤緭鍏ュ瘑鐮� + /// </summary> + public const int PleaseComfirePWD = 10113; + /// <summary> + /// 鍙戦�侀獙璇佺爜鎴愬姛锛岃娉ㄦ剰鏌ユ敹 + /// </summary> + public const int SendVerificationCodeSuccess = 10114; + /// <summary> + /// 纭畾 + /// </summary> + public const int Confrim = 10115; + /// <summary> + /// 璇ヨ处鍙峰凡娉ㄥ唽锛屽彲鐩存帴鐧诲綍 + /// </summary> + public const int 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; /// <summary> - /// 鎵嬫満鍙� + /// 璇烽�夋嫨鍖哄彿 /// </summary> - public const int PhoneNum = 10100; + public const int PleaseSelectAreaCode = 10127; /// <summary> - /// 閭 - /// </summary> - public const int Email = 10101; + /// 鏈縺娲� + /// </summary> + public const int NOTVERIFY = 10128; /// <summary> - /// 璇疯緭鍏ユ墜鏈哄彿 + /// 璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤 /// </summary> - public const int PleaseInputPhoneNum = 10102; + public const int NOTENABLE = 10129; /// <summary> - /// 璇疯緭鍏ヤ笉灏戜簬6浣嶇殑瀵嗙爜 + /// //鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣� /// </summary> - public const int PleaseInputPWD = 10103; + public const int YOUDATANOISLOCALREGION = 10130; /// <summary> - /// 鐧诲綍 + /// 璐﹀彿鎴栧瘑鐮侀敊璇� /// </summary> - public const int Login = 10104; + public const int USERNAMEORPWDERROR = 10131; /// <summary> - /// 楠岃瘉鐮佺櫥褰� + /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽 /// </summary> - public const int LoginByCode = 10105; + public const int ACCOUNTNOEXISTS = 10132; /// <summary> - /// 娉ㄥ唽鐢ㄦ埛 + /// 璇疯緭鍏ラ獙璇佺爜 /// </summary> - public const int Register = 10106; + public const int PleaseInputVerificationCode = 10133; /// <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 LoginByWechat = 10134; #endregion @@ -1001,16 +1049,41 @@ /// 缂栬緫鍦烘櫙 /// </summary> public const int EditorScene = 13141; + /// <summary> + /// 鏈垎閰嶅尯鍩� + /// </summary> + public const int UnallocatedArea = 13142; + /// <summary> + /// 鍔熻兘绫诲瀷 + /// </summary> + public const int FunctionType = 13143; + /// <summary> + /// 澶辫触锛岃閲嶈瘯 + /// </summary> + public const int FailedPleaseTryAgain = 13144; + /// <summary> + /// 鎴愬姛 + /// </summary> + public const int Success = 13145; + /// <summary> + /// 榛樿鍥惧簱 + /// </summary> + public const int LocalPicture = 13146; + /// <summary> + /// 鎷嶇収 + /// </summary> + public const int Photograph = 13147; + /// <summary> + /// 鎴戠殑鐩稿唽 + /// </summary> + public const int MyAblums = 13148; #endregion - /// <summary> - /// 鍠滅埍 - /// </summary> - public static readonly int Favorite = 100000; + public static readonly int OK = 10005; @@ -1032,16 +1105,11 @@ 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 AddRoomBackgroundPicture = 10031; public static readonly int TheRoomNameCannotBeNUll = 10032; @@ -1061,6 +1129,7 @@ public static readonly int PleaseInputVerificationCode = 11011; + @@ -1153,6 +1222,7 @@ public static readonly int ACCOUNTNOEXISTS = 11085; + public static readonly int YourPWDIsTooSample = 11088; public static readonly int PleaseInputTheCorrectEmail = 11089; /// <summary> @@ -1180,135 +1250,109 @@ /// </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; - 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 CancelCollect = 11101; + /// <summary> + /// 淇敼淇℃伅 + /// </summary> + public static readonly int ChangeDeviceInfo = 11102; + /// <summary> + /// 鐧惧垎姣� + /// </summary> + public static readonly int Percent = 11103; + + 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; @@ -1628,10 +1672,6 @@ /// </summary> public const int uCurtainMotor = 15079; /// <summary> - /// 瀹夐槻鍔熻兘 - /// </summary> - public const int uSecurityFunction = 15084; - /// <summary> /// 璁惧绫诲瀷 /// </summary> public const int uDeviceType = 15085; @@ -1759,12 +1799,12 @@ /// 瀹夐槻瀵嗙爜璁剧疆 /// </summary> public const int uSafetyPasswordSettion = 15119; - /// <summary> - /// 鐢ㄦ埛瀵嗙爜 + /// <summary> + /// 瀹夐槻瀵嗙爜 /// </summary> - public const int uUserPassword = 15120; - /// <summary> - /// 鑳佽揩瀵嗙爜 + public const int uSafetyPassword = 15120; + /// <summary> + /// 鑳佽揩瀵嗙爜 /// </summary> public const int uCoercePassword = 15121; /// <summary> @@ -1823,8 +1863,8 @@ /// 鑳佽揩鐘舵�佷笅锛岃閫氱煡浜虹殑鑱旂郴鏂瑰紡 /// </summary> public const int uContactInCoerceStatu = 15135; - /// <summary> - /// 璇疯緭鍏ユ墜鏈哄彿鐮� + /// <summary> + /// 璇疯緭鍏ユ墜鏈哄彿 /// </summary> public const int uPleaseInputPhoneNumber = 15136; /// <summary> @@ -2016,33 +2056,33 @@ /// </summary> public const int uSharedDevice = 15083; /// <summary> - /// 鍏变韩鎴块棿 + /// 鏈垎閰� /// </summary> - public const int uSharedRoom = 15084; - /// <summary> - /// 閰嶇疆鍏变韩璁惧 - /// </summary> - public const int uConfigureSharedDevice = 15185; - /// <summary> - /// 閰嶇疆鍏变韩鎴块棿 - /// </summary> - public const int uConfigureSharedRoom = 15186; - /// <summary> - /// 鍖哄煙鍒楄〃 - /// </summary> - public const int uAreaList = 15187; - /// <summary> - /// 鍒嗕韩 - /// </summary> - public const int uShared = 15188; - /// <summary> - /// 宸茶缃梺璺� - /// </summary> - public const int uHadSetBypass = 15189; - /// <summary> - /// 娣诲姞浼犳劅鍣� - /// </summary> - public const int uAddSensor = 15190; + public const int uUnallocated = 15084; + /// <summary> + /// 閰嶇疆鍏变韩璁惧 + /// </summary> + public const int uConfigureSharedDevice = 15185; + /// <summary> + /// 閰嶇疆鍏变韩鎴块棿 + /// </summary> + public const int uConfigureSharedRoom = 15186; + /// <summary> + /// 鍖哄煙鍒楄〃 + /// </summary> + public const int uAreaList = 15187; + /// <summary> + /// 鍒嗕韩 + /// </summary> + public const int uShared = 15188; + /// <summary> + /// 宸茶缃梺璺� + /// </summary> + public const int uHadSetBypass = 15189; + /// <summary> + /// 娣诲姞浼犳劅鍣� + /// </summary> + public const int uAddSensor = 15190; /// <summary> /// 甯冮槻 /// </summary> @@ -2051,118 +2091,118 @@ /// 纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳? /// </summary> public const int uUpSubAccountLevel = 15192; - /// <summary> - /// 纭畾瑕佹挙閿�璇ユ垚鍛樼鐞嗘潈闄愬悧锛� - /// </summary> + /// <summary> + /// 纭畾鍙栨秷銆寋0}銆嶇鐞嗗憳鏉冮檺锛� + /// </summary> public const int uDownSubAccountLevel = 15193; /// <summary> /// 鎴愬憳鎺堟潈 /// </summary> public const int uMemberAuthorization = 15194; - /// <summary> - /// 鎴愬憳鎺堟潈鎴愬姛 + /// <summary> + /// 鎺堟潈鎴愬姛! /// </summary> public const int uMemberAuthorizationSuccess = 15195; - /// <summary> - /// 璇ユ垚鍛樺凡鎴愪负绠$悊鍛�,鎮ㄧ殑鎺у埗鏉冨凡绉讳氦 + /// <summary> + /// 璇ユ垚鍛樺凡鎴愪负绠$悊鍛� /// </summary> - public const int uSubAccountLevelIsUpAndLetAuthorization = 15196; - /// <summary> - /// 纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵 + public const int uSubAccountLevelIsUp = 15196; + /// <summary> + /// 纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵 /// </summary> - public const int uConfirmRemoveMember = 15197; - /// <summary> - /// 鍒锋柊 + public const int uConfirmRemoveMember = 15197; + /// <summary> + /// 鍒锋柊 /// </summary> - public const int uRefresh = 15198; - /// <summary> - /// 鏈垎閰嶅尯鍩� + public const int uRefresh = 15198; + /// <summary> + /// 鏈垎閰嶅尯鍩� /// </summary> - public const int uDeviceNotAssignedRoom = 15199; - /// <summary> - /// 鍒涘缓浣忓畢 + public const int uDeviceNotAssignedRoom = 15199; + /// <summary> + /// 鍒涘缓浣忓畢 /// </summary> - public const int uCreatResidence = 15200; - /// <summary> - /// 缂栬緫浣忓畢 + public const int uCreatResidence = 15200; + /// <summary> + /// 缂栬緫浣忓畢 /// </summary> - public const int uEditorResidence = 15201; - /// <summary> - /// 璇疯緭鍏ヤ綇瀹呭悕绉� - /// </summary> - public const int uPleaseInputResidenceName = 15202; - /// <summary> - /// 涓嶈兘鍒犻櫎鏈�鍚庡敮涓�鐨勪綇瀹� - /// </summary> - public const int uDoNotDeleteLastResidence = 15203; - /// <summary> - /// 鍋滄閰嶇疆 - /// </summary> - public const int uBreakSettion = 15204; - /// <summary> - /// 杈撳叆瀹夐槻瀵嗙爜 - /// </summary> - public const int uInputSafetyPassword = 15205; - /// <summary> - /// 瀹夐槻瀵嗙爜杈撳叆閿欒 - /// </summary> - public const int uInputSafetyPasswordIsError = 15206; - /// <summary> - /// 澶囦唤杩樺師 - /// </summary> - public const int uBackupAndRecover = 15220; - /// <summary> - /// 鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛� - /// </summary> - public const int uDownLoadAndRecoverMsg = 15221; - /// <summary> - /// 纭畾瑕佸垹闄ゆ枃浠跺悧锛� - /// </summary> - public const int uDoDeleteFileMsg = 15222; - /// <summary> - /// 娣诲姞澶囦唤 - /// </summary> - public const int uAddBackup = 15223; - /// <summary> - /// 缂栬緫澶囦唤 - /// </summary> - public const int uEditorBackup = 15224; - /// <summary> - /// 澶囨敞 - /// </summary> - public const int uBackup = 15225; - /// <summary> - /// 璇疯緭鍏ュ娉ㄥ悕绉� - /// </summary> - public const int uPleaseInpuBackup = 15226; - /// <summary> - /// 鎭㈠鏂囦欢鎴愬姛 - /// </summary> - public const int uFileRecoverSuccess = 15227; - /// <summary> - /// 鎶ヨ鐩爣璁剧疆 - /// </summary> - public const int uAlarmTargetSettion = 15246; - /// <summary> - /// 褰撹闃插尯鎶ヨ鏃讹紝浠ヤ笅鐩爣灏嗕細鍝嶅簲 - /// </summary> - public const int uTargetViewAlarmAfterZoonAlarm = 15247; - /// <summary> - /// 鎺ㄩ�侀�氱煡 - /// </summary> - public const int uInformationPush = 15248; - /// <summary> - /// 娣诲姞鐩爣 - /// </summary> - public const int uAddTarget = 15249; - /// <summary> - /// 娣诲姞鎶ヨ鐩爣 - /// </summary> - public const int uAddAlarmTarget = 15250; - /// <summary> - /// 鍒楄〃 - /// </summary> - public const int uList = 15251; + public const int uEditorResidence = 15201; + /// <summary> + /// 璇疯緭鍏ヤ綇瀹呭悕绉� + /// </summary> + public const int uPleaseInputResidenceName = 15202; + /// <summary> + /// 涓嶈兘鍒犻櫎鏈�鍚庡敮涓�鐨勪綇瀹� + /// </summary> + public const int uDoNotDeleteLastResidence = 15203; + /// <summary> + /// 鍋滄閰嶇疆 + /// </summary> + public const int uBreakSettion = 15204; + /// <summary> + /// 杈撳叆瀹夐槻瀵嗙爜 + /// </summary> + public const int uInputSafetyPassword = 15205; + /// <summary> + /// 瀹夐槻瀵嗙爜杈撳叆閿欒 + /// </summary> + public const int uInputSafetyPasswordIsError = 15206; + /// <summary> + /// 澶囦唤杩樺師 + /// </summary> + public const int uBackupAndRecover = 15220; + /// <summary> + /// 鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛� + /// </summary> + public const int uDownLoadAndRecoverMsg = 15221; + /// <summary> + /// 纭畾瑕佸垹闄ゆ枃浠跺悧锛� + /// </summary> + public const int uDoDeleteFileMsg = 15222; + /// <summary> + /// 娣诲姞澶囦唤 + /// </summary> + public const int uAddBackup = 15223; + /// <summary> + /// 缂栬緫澶囦唤 + /// </summary> + public const int uEditorBackup = 15224; + /// <summary> + /// 澶囨敞 + /// </summary> + public const int uBackup = 15225; + /// <summary> + /// 璇疯緭鍏ュ娉ㄥ悕绉� + /// </summary> + public const int uPleaseInpuBackup = 15226; + /// <summary> + /// 鎭㈠鏂囦欢鎴愬姛 + /// </summary> + public const int uFileRecoverSuccess = 15227; + /// <summary> + /// 鎶ヨ鐩爣璁剧疆 + /// </summary> + public const int uAlarmTargetSettion = 15246; + /// <summary> + /// 褰撹闃插尯鎶ヨ鏃讹紝浠ヤ笅鐩爣灏嗕細鍝嶅簲 + /// </summary> + public const int uTargetViewAlarmAfterZoonAlarm = 15247; + /// <summary> + /// 鎺ㄩ�侀�氱煡 + /// </summary> + public const int uInformationPush = 15248; + /// <summary> + /// 娣诲姞鐩爣 + /// </summary> + public const int uAddTarget = 15249; + /// <summary> + /// 娣诲姞鎶ヨ鐩爣 + /// </summary> + public const int uAddAlarmTarget = 15250; + /// <summary> + /// 鍒楄〃 + /// </summary> + public const int uList = 15251; /// <summary> /// 璇疯緭鍏ョ敤鎴峰悕绉� /// </summary> @@ -2539,12 +2579,12 @@ /// 璇疯緭鍏ョ敤鎴峰瘑鐮� /// </summary> public const int uPleaseInputUserPassword = 15347; - /// <summary> - /// 鐢ㄦ埛瀵嗙爜宸叉洿鏂� + /// <summary> + /// 瀹夐槻瀵嗙爜璁剧疆鎴愬姛 /// </summary> - public const int uUserPasswordRefreshMsg = 15348; - /// <summary> - /// 淇敼鐢ㄦ埛瀵嗙爜澶辫触 + public const int uSetSafetyPasswordSuccess = 15348; + /// <summary> + /// 淇敼鐢ㄦ埛瀵嗙爜澶辫触 /// </summary> public const int uChangedUserPasswordFail = 15349; /// <summary> @@ -3164,9 +3204,9 @@ /// </summary> public const int uGatewayType = 15520; /// <summary> - /// 璁惧纭欢鐗堟湰 + /// 纭欢鐗堟湰 /// </summary> - public const int uDeviceHardwareVersion = 15521; + public const int uHardwareVersion = 15521; /// <summary> /// 缃戝叧鍥轰欢鐗堟湰 /// </summary> @@ -3192,9 +3232,9 @@ /// </summary> public const int uDeviceImageId = 15527; /// <summary> - /// 缃戝叧闀滃儚ID + /// 闀滃儚ID /// </summary> - public const int uGatewayImageId = 15528; + public const int uImageId = 15528; /// <summary> /// 铏氭嫙椹卞姩闀滃儚ID /// </summary> @@ -3266,9 +3306,9 @@ /// <summary> /// 鍥轰欢鏃ユ湡 /// </summary> - public const int uGatewayHardwareDate = 15548; - /// <summary> - /// 娌℃湁鍙戠幇鏂扮綉鍏�,璇锋鏌ョ綉鍏抽摼鎺ユ槸鍚︽甯� + public const int uHardwareDate = 15548; + /// <summary> + /// 娌℃湁鍙戠幇鏂扮綉鍏�,璇锋鏌ョ綉鍏抽摼鎺ユ槸鍚︽甯� /// </summary> public const int uNotFoundNewGatewayPleaseCheckMsg = 15550; /// <summary> @@ -3484,17 +3524,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> @@ -3672,11 +3704,11 @@ /// </summary> public const int uDeviceEpointNote = 15662; /// <summary> - /// 鍔熻兘绫诲瀷 + /// 杩樻病鏈夋坊鍔犲満鏅� /// </summary> public const int uFunctionType = 15663; /// <summary> - /// 閫夋嫨鍔熻兘绫诲瀷 + /// 杩樻病鏈夋坊鍔犺澶� /// </summary> public const int uSelectFunctionType = 15664; /// <summary> @@ -3698,9 +3730,231 @@ /// <summary> /// 骞叉帴鐐瑰娉ㄤ慨鏀规垚鍔�! /// </summary> - public const int uDryContactReNoteSuccess = 15669; + public const int uMode_Dry = 15853; + /// <summary> + /// 鎵撳紑绌鸿皟澶辫触 + /// </summary> + public const int uOpenAirConditionerFail = 15854; + /// <summary> + /// 鍏抽棴绌鸿皟澶辫触 + /// </summary> + public const int uCloseAirConditionerFail = 15855; + /// <summary> + /// 璇锋敞鎰忔竻娲楁护缃戝摝 + /// </summary> + public const int uPleaseClreanACfilter = 15856; + /// <summary> + /// 鏃犲彲鍏变韩鐨勫満鏅� + /// </summary> + public const int uNotCanShardSceneMsg = 15857; + /// <summary> + /// 鏃犲彲鍏变韩鐨勮澶� + /// </summary> + public const int uNotCanShardDeviceMsg = 15858; + /// <summary> + /// 鏃犲彲鍙栨秷鍏变韩鐨勫満鏅� + /// </summary> + public const int uNotCanCancelShardSceneMsg = 15859; + /// <summary> + /// 鏃犲彲鍙栨秷鍏变韩鐨勮澶� + /// </summary> + public const int uNotCanCancelDeviceMsg = 15860; + /// <summary> + /// 纭鍒犻櫎閫夋嫨鐨勫叡浜満鏅拰鍔熻兘锛� + /// </summary> + public const int uDeleteShardContentMsg = 15861; + /// <summary> + /// 纭畾鍒涘缓銆屽畨闃层�嶆嵎寰勫埌涓婚〉锛� + /// </summary> + public const int uCreatSafetyShortcutMsg = 15862; + /// <summary> + /// 纭畾鍙栨秷涓婚〉鐨勩�屽畨闃层�嶆嵎寰勶紵 + /// </summary> + public const int uCancelSafetyShortcutMsg = 15863; + /// <summary> + /// 璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡 + /// </summary> + public const int uGotoCenterAndSetSecondAuthentication = 15864; + /// <summary> + /// 24灏忔椂闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝峽0}闃插尯琚Е鍙戠珛鍗虫姤璀0}涓�鑸缃儫闆俱�佺噧姘斻�佹按娴哥瓑浼犳劅鍣� + /// </summary> + public const int u24HourSectorsTipMsg = 15865; + /// <summary> + /// 鍦ㄧ瀹跺竷闃叉ā寮忎笅锛屽唴閮ㄩ槻鍖轰紶鎰熷櫒瑙﹀彂{0}绔嬪嵆鎶ヨ銆傚湪鍦ㄥ甯冮槻妯″紡涓媨0}鍐呴儴闃插尯鎵�鏈変紶鎰熷櫒涓嶅弬涓庢姤璀� + /// </summary> + public const int uInteriorSectorsTipMsg = 15866; + /// <summary> + /// 绂诲甯冮槻妯″紡鎴栧湪瀹跺竷闃叉ā寮忎笅{0}鍛ㄧ晫闃插尯浼犳劅鍣ㄨЕ鍙戠珛鍗虫姤璀� + /// </summary> + public const int uPerimeterSectorsTipMsg = 15867; + /// <summary> + /// 鍦ㄥ竷闃插悗绯荤粺鎻愪緵涓�瀹氱殑寤惰繜鏃堕棿銆傚嚭闂ㄦ椂{0}澶栧嚭寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ{0}鍥炲鏃讹紝杩涘叆寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ + /// </summary> + public const int uInAndOutSectorsTipMsg = 15868; + /// <summary> + /// 闈欓煶闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝嶏紝闃插尯琚珄0}瑙﹀彂绔嬪嵆鎶ヨ锛岄�氬父涓嶄骇鐢熷0闊虫垨{0}鍏朵粬鎻愮ず锛屽彧鍙戦�佷俊鎭埌鐗瑰畾鐨勬帴鏀惰�� + /// </summary> + public const int uMuteSectorsTipMsg = 15869; /// <summary> - /// 鑳屽厜鐏� + /// 杩樻病鏈夎缃紶鎰熷櫒 + /// </summary> + public const int uDoNotHadSettionSensorMsg = 15870; + /// <summary> + /// 杩樻病鏈夎缃姤璀︾洰鏍� + /// </summary> + public const int uDoNotHadSettionTargetMsg = 15871; + /// <summary> + /// 鏃犳硶璇嗗埆鐨勮澶� + /// </summary> + public const int uUnDistinguishTheDevice = 15872; + /// <summary> + /// 鎷嶇収 + /// </summary> + public const int uTakePictrue = 15873; + /// <summary> + /// 浠庣浉鍐屼腑閫夋嫨 + /// </summary> + public const int uGetPictrueFromAlbum = 15874; + /// <summary> + /// 鍑虹幇鏈煡閿欒 + /// </summary> + public const int uUnKnownError = 15875; + /// <summary> + /// 璇疯緭鍏ユ墜鍔� + /// </summary> + public const int uPleaseInputGesture = 15876; + /// <summary> + /// 璇峰啀娆¤緭鍏ユ墜鍔� + /// </summary> + public const int uPleaseInputGestureAgain = 15877; + /// <summary> + /// 鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍 + /// </summary> + public const int uEditorGesturePleaseInputNewGesture = 15878; + /// <summary> + /// 纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆 + /// </summary> + public const int uGestureNotEqual = 15879; + /// <summary> + /// 鎵嬪娍閿欒锛岃閲嶆柊杈撳叆 + /// </summary> + public const int uOldGestureIsError = 15880; + /// <summary> + /// 鎵嬪娍瀵嗙爜闀垮害蹇呴』澶т簬{0} + /// </summary> + public const int uGesturePswLenthError = 15881; + /// <summary> + /// 蹇樿鎵嬪娍锛� + /// </summary> + public const int uForgotGestureMsg = 15882; + /// <summary> + /// 鐢ㄤ簬鍦ㄥ甯冮槻銆佺瀹跺竷闃层�佹挙闃叉搷浣� + /// </summary> + public const int uUserInGarrisonAndWithdrawGarrison = 15883; + /// <summary> + /// 杈撳叆璇ュ瘑鐮侊紝绔嬪嵆閫氱煡浠栦汉 + /// </summary> + public const int uEnterPasswordToNotifyOthersImmediately = 15884; + /// <summary> + /// 鍙栨秷鎴愬姛 + /// </summary> + public const int uCancelSuccess = 15885; + /// <summary> + /// 璇ョ鐞嗗憳宸叉垚涓烘垚鍛� + /// </summary> + public const int uSubAccountLevelIsDown = 15886; + /// <summary> + /// 璇疯緭鍏ユ柊鎵嬪娍 + /// </summary> + public const int uPleaseInputNewGesture = 15887; + /// <summary> + /// 鐢ㄦ埛瀵嗙爜 + /// </summary> + public const int uUserPassword = 15888; + /// <summary> + /// 褰撳墠浣跨敤瀵嗙爜 + /// </summary> + public const int uNowUsePassword = 15889; + /// <summary> + /// 澶囨敞淇℃伅 + /// </summary> + public const int uNoteInformation = 15890; + /// <summary> + /// 璇疯緭鍏ュ娉ㄥ唴瀹� + /// </summary> + public const int uPlesaeInputNoteInformation = 15891; + /// <summary> + /// 淇敼澶囨敞淇℃伅鎴愬姛! + /// </summary> + public const int uEditorNoteInformationSuccess = 15892; + /// <summary> + /// 杈撳叆鍐呭杩囬暱,鏈�澶0}瀛楄妭 + /// </summary> + public const int uInputContentIsOverLengthMsg = 15893; + /// <summary> + /// 淇敼澶囨敞淇℃伅澶辫触 + /// </summary> + public const int uEditorNoteInformationFail = 15894; + /// <summary> + /// 璇疯緭鍏ユ柊鑳佽揩瀵嗙爜 + /// </summary> + public const int uPleaseInputNewCoercePassword = 15895; + /// <summary> + /// 璇烽噸澶嶈緭鍏ユ柊鑳佽揩瀵嗙爜 + /// </summary> + public const int uPleaseRepeatInputNewCoercePassword = 15896; + /// <summary> + /// 鑳佽揩瀵嗙爜璁剧疆鎴愬姛 + /// </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; + + //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽� + /// <summary> + /// 鎸囧畾缃戝叧宸茬粡琚粦瀹� + /// </summary> + public const int BindGwToHome_BindGatewaysExists = 18004; + /// <summary> + /// 鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹� + /// </summary> + public const int BindSubAccount_NoExist = 18005; + /// <summary> + /// 璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢 /// </summary> public const int uBackLight = 15670; /// <summary> @@ -4822,4 +5076,4 @@ /// </summary> public const int uDeviceBelongId12 = 40013; } -} \ No newline at end of file +} -- Gitblit v1.8.0