From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/R.cs | 768 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 444 insertions(+), 324 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 017aa13..23ea4c2 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -306,6 +306,9 @@
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 SureClearKeyModeAndTargets = 223;
+ public readonly static int BindDeviceTargetIsEmpty = 224;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -572,7 +575,10 @@
public readonly static int linkageevent = 5366;
public readonly static int current = 5367;
public readonly static int selecfoolr = 5368;
-
+ public readonly static int delaytip = 5369;
+ public readonly static int usertip = 5370;
+ public readonly static int scenetip = 5371;
+ public readonly static int securitytip = 5372;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -583,6 +589,7 @@
/// 甯哥敤
/// </summary>
public const int Favorite = 10001;
+
/// <summary>
@@ -649,20 +656,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>
@@ -714,7 +721,7 @@
/// </summary>
public const int USERNAMEORPWDERROR = 10131;
/// <summary>
- /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+ /// 璐﹀彿涓嶅瓨鍦紝璇锋敞鍐岀敤鎴�
/// </summary>
public const int ACCOUNTNOEXISTS = 10132;
/// <summary>
@@ -725,16 +732,124 @@
/// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
/// </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;
- #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>
+ /// 姝ｅ湪鏇存柊涓�...
+ /// </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>
@@ -794,7 +909,7 @@
/// </summary>
public const int Save = 11021;
/// <summary>
- /// 鎻愮ず
+ /// 鎻愰啋
/// </summary>
public const int TIP = 11022;
/// <summary>
@@ -841,6 +956,10 @@
/// 閫夋嫨鍦烘櫙鍥剧墖
/// </summary>
public const int SelectScenePic = 11033;
+ /// <summary>
+ /// 纭畾瑕佺Щ闄よ鍔熻兘锛�
+ /// </summary>
+ public const int DeleteFunction = 11034;
#region 璁惧绫诲瀷
/// <summary>
@@ -879,6 +998,18 @@
/// 涓户鍣�
/// </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;
#endregion
@@ -1084,6 +1215,12 @@
/// 鎴戠殑鐩稿唽
/// </summary>
public const int MyAblums = 13148;
+ /// <summary>
+ /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
+ /// </summary>
+ public const int TheSceneIsDelaying = 13149;
+
+
/// <summary>
/// 閫夋嫨鎽嗛
@@ -1113,306 +1250,29 @@
/// 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;
+
+
#endregion
+
-
-
-
- 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>
- /// 姝ｅ悜
- /// </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>
@@ -1620,7 +1480,7 @@
/// </summary>
public const int uPleaseWait = 15052;
/// <summary>
- /// 璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+ /// 璇风‘淇濈綉鍏崇敤缃戠嚎姝ｅ父杩炴帴璺敱鍣▄0}姝ｅ父杩炴帴鍒欑郴缁熸寚绀虹伅1绉掗棯鐑�
/// </summary>
public const int ConfirmLineConnectMsg = 15053;
/// <summary>
@@ -4216,11 +4076,11 @@
/// </summary>
public const int uSearchGatewayFailMsg1 = 15779;
/// <summary>
- /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔勭伃鍚庯紝閲嶆柊鍏ョ綉銆�
+ /// 1.鐭寜HID/WCFG鎸夐敭,绯荤粺鎸囩ず鐏揩闂�3绉�,缃戝叧杩涘叆鎹㈢粦妯″紡,寮哄埗缃戝叧缁戝畾鍒板綋鍓岮PP
/// </summary>
public const int uSearchGatewayFailMsg2 = 15780;
/// <summary>
- /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯5绉掋��
+ /// 2.闀挎寜缃戝叧ZB/RST鎸夐敭20绉掍互涓�,鐩村埌鎵�鏈夋寚绀虹伅鍚屾椂鐏�,鍗虫仮澶嶅嚭鍘傝缃苟閲嶅惎
/// </summary>
public const int uSearchGatewayFailMsg3 = 15781;
/// <summary>
@@ -4348,11 +4208,11 @@
/// </summary>
public const int uCommitCurtainLimitFail = 15812;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄紑闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄紑闄愪綅?
/// </summary>
public const int uCommitCurtainOpenLimitMsg = 15813;
/// <summary>
- /// 纭褰撳墠浣嶇疆{0}涓哄悎闄愪綅?
+ /// 纭褰撳墠浣嶇疆涓哄悎闄愪綅?
/// </summary>
public const int uCommitCurtainCloseLimitMsg = 15814;
/// <summary>
@@ -4724,15 +4584,15 @@
/// </summary>
public const int uWlanConnectHomeWifi = 15906;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
- public const int uAddUdpWirelessGatewayMsg = 15907;
+ public const int uAddUdpWirelessGatewayMsg1 = 15907;
/// <summary>
- /// 闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// 璇峰厛闀挎寜HID/WCFG鎸夐敭澶ф5绉抺0}鐩村埌绯荤粺鎸囩ず鐏父浜畕0}缃戝叧杩涘叆AP妯″紡鐑偣
/// </summary>
public const int uAddApWirelessGatewayMsg1 = 15908;
/// <summary>
- /// 璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// 鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
/// </summary>
public const int uAddApWirelessGatewayMsg2 = 15909;
/// <summary>
@@ -4740,11 +4600,11 @@
/// </summary>
public const int uPleaseInputHomeWifiAccount = 15910;
/// <summary>
- /// 璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
+ /// 鎵嬫満鍘昏缃繛鎺ヨ矾鐢卞櫒
/// </summary>
public const int uAddApWirelessGatewayMsg3 = 15911;
/// <summary>
- /// 绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// 缃戝叧濡傛灉姝ｅ父杩炴帴璺敱鍣▄0}绯荤粺鎸囩ず鐏細1绉掗棯鐑�
/// </summary>
public const int uAddApWirelessGatewayMsg4 = 15912;
/// <summary>
@@ -4836,7 +4696,7 @@
/// </summary>
public const int uSetGatewaySiteFail = 15936;
/// <summary>
- /// 姝ｅ湪淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅
+ /// 姝ｅ湪淇濆瓨鍗忚皟鍣╪v鍒嗗尯淇℃伅
/// </summary>
public const int uGatewayNVFileSaving = 15937;
/// <summary>
@@ -4867,6 +4727,254 @@
/// 姝ｅ湪鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
/// </summary>
public const int uZbMsComSendOpening = 15944;
+ /// <summary>
+ /// 鑾峰彇缃戝叧鑷姩澶囦唤璁剧疆澶辫触
+ /// </summary>
+ public const int uGetGatewayAutoBackupStatuFail = 15945;
+ /// <summary>
+ /// 璁剧疆缃戝叧鑷姩澶囦唤澶辫触
+ /// </summary>
+ public const int uSetGatewayAutoBackupStatuFail = 15946;
+ /// <summary>
+ /// 姝ｅ湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
+ /// </summary>
+ public const int uBackupFileListGetting = 15947;
+ /// <summary>
+ /// 鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+ /// </summary>
+ public const int uGetBackupFileListFail = 15948;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndGetBackupFileListFail = 15949;
+ /// <summary>
+ /// 姝ｅ湪涓嬭浇澶囦唤鏂囦欢
+ /// </summary>
+ public const int uBackupFileDownloading = 15950;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,涓嬭浇澶囦唤鏂囦欢澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndDownloadBackupFileFail = 15951;
+ /// <summary>
+ /// 涓嬭浇澶囦唤鏂囦欢澶辫触
+ /// </summary>
+ public const int uDownloadBackupFileFail = 15952;
+ /// <summary>
+ /// 姝ｅ湪鎭㈠鍗忚皟鍣╪v鍒嗗尯
+ /// </summary>
+ public const int uGatewayNVRestoring = 15953;
+ /// <summary>
+ /// 鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+ /// </summary>
+ public const int uRestoreGatewayNVFail = 15954;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndRestoreGatewayNVFail = 15955;
+ /// <summary>
+ /// 姝ｅ湪閲嶅惎缃戝叧绯荤粺
+ /// </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鍙婄鍙ｅ湪浜戠涓嶅瓨鍦�,璇烽噸鏂扮櫥褰�!
+ /// </summary>
+ public const int uYouIpAndPortNoRecord = 15972;
+ /// <summary>
+ /// 娑堟伅涓績
+ /// </summary>
+ public const int uMessageCenter = 15973;
+ /// <summary>
+ /// 纭鍒犻櫎娑堟伅?
+ /// </summary>
+ public const int uDeleteMessageMsg = 15974;
+ /// <summary>
+ /// 姝ｅ湪涓婁紶澶囦唤鏂囦欢
+ /// </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>
+ /// 姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
+ /// </summary>
+ public const int uShardContentGetting = 15983;
+ /// <summary>
+ /// 璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddUdpWirelessGatewayMsg2 = 15984;
+ /// <summary>
+ /// 缃戝叧娣诲姞鎸囧紩
+ /// </summary>
+ public const int uAddGatewayGuide = 15985;
+ /// <summary>
+ /// 1.璇风敤缃戠嚎杩炴帴缃戝叧缃戝彛鍒拌矾鐢卞櫒锛屽苟瑙傚療缃戝彛LED浜苟闂儊鎴栬瀵熷澹崇綉鍙ｆ寚绀虹伅浜苟闂儊
+ /// </summary>
+ public const int uAddWiredGatewayHelp1 = 15986;
+ /// <summary>
+ /// 2.缃戝叧閲嶅惎澶х害闇�瑕�1鍒嗛挓锛岃繖鏃惰瀵熷澹崇郴缁熸寚绀虹伅锛屽鏋�1绉掗棯鐑侊紝琛ㄧず缃戝叧杩炴帴璺敱鍣ㄦ甯革紝鍙互鐢ˋPP杩涜娣诲姞缃戝叧姝ラ
+ /// </summary>
+ public const int uAddWiredGatewayHelp2 = 15987;
+ /// <summary>
+ /// 缃戝叧纭欢闂甯姪
+ /// </summary>
+ public const int uGatewayHardDeviceHelp = 15988;
+ /// <summary>
+ /// 1.缃戝彛鎸囩ず鐏笉浜�,妫�鏌ョ綉绾挎垨璺敱鍣ㄦ槸鍚︽甯�
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp1 = 15989;
+ /// <summary>
+ /// 2.绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛),绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWiredGatewayHardDeviceHelp2 = 15990;
+ /// <summary>
+ /// 绯荤粺鍚姩涔嬪悗(绯荤粺鎸囩ず鐏�5绉掗棯鐑�,琛ㄧず绯荤粺鍚姩鎴愬姛)
+ /// </summary>
+ public const int uAddWirelessGatewayHelp1 = 15991;
+ /// <summary>
+ /// 2.鏍规嵁APP鎻愮ず杩涘叆涔嬪悗鐨勬楠�
+ /// </summary>
+ public const int uAddWirelessGatewayHelp2 = 15992;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉�,鐩村埌绯荤粺鎸囩ず鐏揩闂�,缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessUdpGatewayHelp1 = 15993;
+ /// <summary>
+ /// 1.璇峰厛闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф5绉�,鐩村埌绯荤粺鎸囩ず鐏父浜�,缃戝叧杩涘叆AP妯″紡WIFI閰嶇綉
+ /// </summary>
+ public const int uAddWirelessApGatewayHelp1 = 15994;
+ /// <summary>
+ /// 1.鐭寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp1 = 15995;
+ /// <summary>
+ /// 2.闀挎寜HID/WCFG鎸夐敭,鏌ョ湅鎸囩ず鐏槸鍚︽湁鍙樺寲,鍙垽鏂寜閿拰鎸囩ず鐏槸鍚︽崯鍧�
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp2 = 15996;
+ /// <summary>
+ /// 3.绯荤粺鎸囩ず鐏笉鏄�1绉掗棯鐑�,妫�鏌ヨ矾鐢卞櫒鏄惁寮�鍚疍HCP鑷姩鍒嗛厤IP
+ /// </summary>
+ public const int uWirelessGatewayHardDeviceHelp3 = 15997;
+ /// <summary>
+ /// 璇峰墠寰�浣忓畢绠＄悊{0}璁剧疆浣忓畢鐨勫湴鐞嗕綅缃�
+ /// </summary>
+ public const int uGotoResidenceAndSetLocation = 15998;
+ /// <summary>
+ /// 鏈煡妤煎眰
+ /// </summary>
+ public const int uUnKnownFloor = 15999;
+ /// <summary>
+ /// 濡傛灉涓嶈缃綇瀹呯殑鍦扮悊浣嶇疆,鍒欎細褰卞搷鑷姩鍖栧湴鐞嗗洿鏍忓姛鑳界殑璁剧疆
+ /// </summary>
+ public const int uNotSetLocationWillAffectTheAutomaticGeofencingFunction = 16000;
+ /// <summary>
+ /// 绌鸿皟妯″潡鐗堟湰
+ /// </summary>
+ public const int uAirConditionerModelVersion = 16001;
+ /// <summary>
+ /// 閫氫俊鑺墖
+ /// </summary>
+ public const int uCommunicationChip = 16002;
+ /// <summary>
+ /// 绌鸿皟妯″潡
+ /// </summary>
+ public const int uAirConditioningModule = 16003;
+ /// <summary>
+ /// 鑾峰彇澶辫触
+ /// </summary>
+ public const int uGettingFail = 16004;
+ /// <summary>
+ /// 鏃犳硶璇嗗埆
+ /// </summary>
+ public const int uUnDistinguish = 16005;
+ /// <summary>
+ /// 姝ｅ湪閲嶇疆鐢垫満
+ /// </summary>
+ public const int uElectricalMachineryResetting = 16006;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -5096,7 +5204,7 @@
/// </summary>
public const int uDeviceModelId1301 = 30005;
/// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee寰柇浜戞帶鍒跺櫒
+ /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛氭櫤鑳界┖寮�
/// </summary>
public const int uDeviceModelId4100 = 30006;
/// <summary>
@@ -5175,6 +5283,18 @@
/// 闀滃儚ID涓�2800鐨勮澶囩殑榛樿鍚嶅瓧锛欻06C
/// </summary>
public const int uDeviceModelId2800 = 30025;
+ /// <summary>
+ /// 闀滃儚ID涓�220鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId220 = 30026;
+ /// <summary>
+ /// 闀滃儚ID涓�221鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId221 = 30027;
+ /// <summary>
+ /// 闀滃儚ID涓�222鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId222 = 30028;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0