From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/R.cs | 416 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 411 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 990a82a..6d096b4 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -1089,7 +1089,7 @@
//*****public static readonly int Function = 11038;
-
+
public static readonly int AddFunction = 11042;
public static readonly int Light = 11044;
@@ -1171,10 +1171,416 @@
/// 鏃堕棿闂撮殧
/// </summary>
public static readonly int TimeSpan = 11093;
-
+
+ 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 PleaseSelectAreaCode = 10015;
+
+ public static readonly int ThePhoneNumberIsNotRegisteredYetPleaseRegisterFirst = 10017;
+ public static readonly int LoginCodeError = 10018;
+ public static readonly int ThisUserBelongsToDebugAccountAndIsNotEnabled = 10019;
+ public static readonly int PleaseGoToTheMailboxToConfirmThePasswordChange = 10020;
+
+ public static readonly int MailDeliveryFailedPleaseTryAgain = 10021;
+ public static readonly int TheAccountIsNotAuthorized = 10022;
+ public static readonly int Version = 10023;
+ public static readonly int QuitAccount = 10024;
+ public static readonly int InputNewPWD = 10025;
+ public static readonly int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10026;
+ public static readonly int ResidentialNameCannotBeEmpty = 10027;
+ public static readonly int TheResidenceNameHasExist = 10028;
+ public static readonly int DelResidence = 10029;
+ public static readonly int PWDCannotBeNull = 10030;
+
+ public static readonly int 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 PleaseInputVerificationCode = 11011;
+
+
+
+ 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 Delete = 11041;
+ public static readonly int AddFunction = 11042;
+
+ public static readonly int Light = 11044;
+ public static readonly int AddLight = 11045;
+ public static readonly int DropLight = 11046;
+ public static readonly int DownLight = 11047;
+ public static readonly int SpotLight = 11048;
+ public static readonly int DeviceName = 11049;
+
+
+ public static readonly int 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;
+
+
+ /// <summary>
+ /// 鏈縺娲�
+ /// </summary>
+ public static readonly int NOTVERIFY = 11081;
+ /// <summary>
+ /// 璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
+ /// </summary>
+ public static readonly int NOTENABLE = 11082;
+ /// <summary>
+ /// //鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
+ /// </summary>
+ public static readonly int YOUDATANOISLOCALREGION = 11083;
+ /// <summary>
+ /// 璐﹀彿鎴栧瘑鐮侀敊璇�
+ /// </summary>
+ public static readonly int USERNAMEORPWDERROR = 11084;
+ /// <summary>
+ /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+ /// </summary>
+ public static readonly int ACCOUNTNOEXISTS = 11085;
+
+
+ public static readonly int YourPWDIsTooSample = 11088;
+ public static readonly int PleaseInputTheCorrectEmail = 11089;
+ /// <summary>
+ /// 鎿嶄綔澶辫触
+ /// </summary>
+ public static readonly int FAIL = 11090;
+ /// <summary>
+ /// 鍙戦�侀獙璇佺爜澶辫触
+ /// </summary>
+ public static readonly int SENDFAIL = 11091;
+ /// <summary>
+ /// 杩炴帴缃戝叧鎴栬�呰幏鍙栨暟鎹け璐�
+ /// </summary>
+ public static readonly int ConnectGWFail = 11092;
+ /// <summary>
+ /// 鏃堕棿闂撮殧
+ /// </summary>
+ public static readonly int TimeSpan = 11093;
+ public static readonly int TheSceneHadExist = 11094;
+ public static readonly int AddSceneFail = 11095;
+
+ /// <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;
+ 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>
+ /// 姝ｅ悜
+ /// </summary>
+ public static readonly int ForwardDirection = 12017;
+ /// <summary>
+ /// 鍙嶅悜
+ /// </summary>
+ public static readonly int ReverseDirection = 12018;
+ /// <summary>
+ /// 闄愪綅
+ /// </summary>
+ public static readonly int Limit = 12019;
+ /// <summary>
+ /// 寮�濮�
+ /// </summary>
+ public static readonly int Start = 12020;
+ /// <summary>
+ /// 缁撴潫
+ /// </summary>
+ public static readonly int End = 12021;
+ /// <summary>
+ /// 鎭㈠琛岀▼璁剧疆
+ /// </summary>
+ public static readonly int RestoreTravelSettings = 12022;
+ /// <summary>
+ /// 鎭㈠琛岀▼璁剧疆鍚庯紝褰撳墠璁剧疆灏嗚鍒濆鍖栵紝纭畾缁х画鍚楋紵
+ /// </summary>
+ public static readonly int IsCancelRestoreTravelSettings = 12023;
+ /// <summary>
+ /// 鍒囨崲缁存姢妯″紡澶辫触
+ /// </summary>
+ public static readonly int ChangeMaintenanceMode_Fail = 12024;
+ /// <summary>
+ /// 鏄惁璁剧疆褰撳墠浣嶇疆涓哄紑濮嬮檺浣嶏紵
+ /// </summary>
+ public static readonly int SettingStartLimit = 12025;
+ /// <summary>
+ /// 鏄惁璁剧疆褰撳墠浣嶇疆涓虹粨鏉熼檺浣嶏紵
+ /// </summary>
+ public static readonly int SettingEndLimit = 12026;
+ /// <summary>
+ /// 璁剧疆寮�濮嬮檺浣�
+ /// </summary>
+ public static readonly int SetStartLimit = 12027;
+ /// <summary>
+ /// 璁剧疆缁撴潫闄愪綅
+ /// </summary>
+ public static readonly int SetEndLimit = 12028;
+ /// <summary>
+ /// 瀵艰建绉诲姩涓紝璇风瓑寰呫�傘�傘��
+ /// </summary>
+ public static readonly int PleaseWaitWhileTheGuidewayIsMoving = 12029;
+ /// <summary>
+ /// 鎮ㄧ殑璐﹀彿宸插湪鍙︿竴鍙拌澶囩櫥褰曪紝鎮ㄥ凡琚己鍒朵笅绾�
+ /// </summary>
+ public static readonly int YouHaveBeenSignOut = 12030;
+
+ /// <summary>
+ /// 鍦烘櫙涓凡鍖呭惈璇ュ満鏅�
+ /// </summary>
+ public static readonly int ThisSceneHadTheScene = 12032;
+ /// <summary>
+ /// 褰撳墠娌℃悳绱㈠埌缃戝叧锛岃鍏堟坊鍔犵綉鍏�
+ /// </summary>
+ public static readonly int NoGateway = 12033;
+ /// <summary>
+ ///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
+ /// </summary>
+ public static readonly int NoDeviceCanAddToRoom = 12034;
+ /// <summary>
+ /// 閫夋嫨椋庨��
+ /// </summary>
+ public static readonly int SelectFanMode = 12035;
+ /// <summary>
+ /// 浣庨
+ /// </summary>
+ public static readonly int Fan_Low = 12036;
+ /// <summary>
+ /// 涓
+ /// </summary>
+ public static readonly int Fan_Middle = 12037;
+ /// <summary>
+ /// 楂橀
+ /// </summary>
+ public static readonly int Fan_Height = 12038;
+ /// <summary>
+ /// 閫夋嫨妯″紡
+ /// </summary>
+ public static readonly int SelectMode = 12039;
+ /// <summary>
+ /// 鑷姩
+ /// </summary>
+ public static readonly int Mode_Auto = 12040;
+ /// <summary>
+ /// 鍒跺喎
+ /// </summary>
+ public static readonly int Mode_Cool = 12041;
+ /// <summary>
+ /// 鍒剁儹
+ /// </summary>
+ public static readonly int Mode_Heat = 12042;
+ /// <summary>
+ /// 闄ゆ箍
+ /// </summary>
+ public static readonly int Mode_Dry = 12043;
+ /// <summary>
+ /// 閫侀
+ /// </summary>
+ public static readonly int Mode_FanOnly = 12044;
+ /// <summary>
+ /// 瀹ゆ俯
+ /// </summary>
+ public static readonly int IndoorTemperature = 12045;
+ /// <summary>
+ /// 绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
+ /// </summary>
+ public static readonly int TheACIsClose = 12046;
+
+
+ #region 璁惧绫诲瀷
+ /// <summary>
+ /// 鏈煡璁惧
+ /// </summary>
+ public static readonly int UnknowDevice = 12100;
+ /// <summary>
+ /// 鎺у埗闈㈡澘
+ /// </summary>
+ //public static readonly int OnOffSwitch = 12101;
+ /// <summary>
+ /// 缁х數鍣�
+ /// </summary>
+ public static readonly int OnOffOutput = 12102;
+ /// <summary>
+ /// 璋冨厜鐏�
+ /// </summary>
+ public static readonly int DimmableLight = 12103;
+ /// <summary>
+ /// 绐楀笜
+ /// </summary>
+ public static readonly int WindowCoveringDevice = 12104;
+ /// <summary>
+ /// 绌鸿皟
+ /// </summary>
+ public static readonly int Thermostat = 12105;
+ /// <summary>
+ /// 浼犳劅鍣�
+ /// </summary>
+ public static readonly int IASZone = 12106;
+ /// <summary>
+ /// 绌烘皵寮�鍏�
+ /// </summary>
+ public static readonly int AirSwitch = 12107;
+ /// <summary>
+ /// 褰╃伅
+ /// </summary>
+ public static readonly int ColorDimmableLight = 12108;
+ /// <summary>
+ /// 涓户鍣�
+ /// </summary>
+ public static readonly int Repeater = 12109;
+
+ #endregion
+
+ /// <summary>
+ /// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
+ /// </summary>
+ public static readonly int TheRoomNoDeviceAddToScene = 12500;
+
+ /// <summary>
+ /// 寰�涓婄Щ鍔�
+ /// </summary>
+ public static readonly int RollerShadeUp = 12501;
+ /// <summary>
+ /// 寰�涓嬬Щ鍔�
+ /// </summary>
+ public static readonly int RollerShadeDown = 12502;
+
+
+ /// <summary>
+ /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+ /// </summary>
+ public const int PswLengthMsg = 15000;
/// <summary>
/// 鑷畾涔�
/// </summary>
@@ -1307,10 +1713,10 @@
///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
/// </summary>
public static readonly int NoDeviceCanAddToRoom = 12034;
-
-
-
+
+
+
/// <summary>
/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
--
Gitblit v1.8.0