From a2d26f15b940c853faaf6d6959b16a6d919cb800 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 27 十一月 2019 19:26:30 +0800
Subject: [PATCH] 请合并最新的代码（完成门锁功能）
---
ZigbeeApp/Shared/R.cs | 1093 ++++++++++++++++++++++++++++----------------------------
1 files changed, 547 insertions(+), 546 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 60ad83f..4ba6eba
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -306,6 +306,7 @@
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;
@@ -370,7 +371,7 @@
public readonly static int Sunrisesunset = 5134;
public readonly static int cycle = 5135;
public readonly static int completeNext = 5136;
- public readonly static int Selectedtimetype= 5137;
+ public readonly static int Selectedtimetype = 5137;
public readonly static int Timecondition = 5138;
public readonly static int condition = 5139;
public readonly static int pushset = 5140;
@@ -428,7 +429,7 @@
public readonly static int addtime = 5192;
public readonly static int selectcommontimetype = 5193;
public readonly static int newautomation = 5194;
- public readonly static int editautomation= 5195;
+ public readonly static int editautomation = 5195;
public readonly static int open1 = 5196;
public readonly static int disable = 5197;
public readonly static int selectsavedautomationstate = 5198;
@@ -564,10 +565,10 @@
public readonly static int logictemplate = 5358;
public readonly static int onlight = 5359;
public readonly static int offlight = 5360;
- public readonly static int OnOffSwitch=5361;
+ public readonly static int OnOffSwitch = 5361;
public readonly static int addlinkageevent = 5362;
public readonly static int editlinkageevent = 5363;
- public readonly static int selectunlockingmode=5364;
+ public readonly static int selectunlockingmode = 5364;
public readonly static int lockaddaction = 5365;
public readonly static int linkageevent = 5366;
public readonly static int current = 5367;
@@ -585,114 +586,114 @@
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;
+ /// <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>
@@ -727,120 +728,120 @@
public const int LoginByWechat = 10134;
- #endregion
+ #endregion
- #region 鍒嗙被
+ #region 鍒嗙被
- /// <summary>
- /// 鍔熻兘
- /// </summary>
- public const int Function = 11000;
- /// <summary>
- /// 鍦烘櫙
- /// </summary>
- public const int Scence = 11001;
- /// <summary>
- /// 鑷姩鍖�
- /// </summary>
- public const int Automation = 11002;
+ /// <summary>
+ /// 鍔熻兘
+ /// </summary>
+ public const int Function = 11000;
+ /// <summary>
+ /// 鍦烘櫙
+ /// </summary>
+ public const int Scence = 11001;
+ /// <summary>
+ /// 鑷姩鍖�
+ /// </summary>
+ public const int Automation = 11002;
- /// <summary>
- /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�
- /// </summary>
- public const int NoFunction = 11010;
- /// <summary>
- /// 缂栬緫
- /// </summary>
- public const int Edit = 11011;
- /// <summary>
- /// 璁剧疆鍔熻兘
- /// </summary>
- public const int FunctionSetting = 11012;
- /// <summary>
- /// 淇℃伅缂栬緫
- /// </summary>
- public const int EditInfo = 11013;
- /// <summary>
- /// 鍔熻兘鍚嶇О
- /// </summary>
- public const int FunctionName = 11014;
- /// <summary>
- /// 鎵�灞炲尯鍩�
- /// </summary>
- public const int BelongZone = 11015;
- /// <summary>
- /// 鎵�灞炴ā鍧�
- /// </summary>
- public const int BelongModel = 11016;
- /// <summary>
- /// 鏈煡
- /// </summary>
- public const int UNKnown = 11017;
- /// <summary>
- /// 鍒嗕韩
- /// </summary>
- public const int Share = 11018;
- /// <summary>
- /// 鍒嗕韩鐨�
- /// </summary>
- public const int Shared = 11019;
- /// <summary>
- /// 閫夋嫨鍥炬爣
- /// </summary>
- public const int SelectIcon = 11020;
- /// <summary>
- /// 淇濆瓨
- /// </summary>
- public const int Save = 11021;
- /// <summary>
- /// 鎻愮ず
- /// </summary>
- public const int TIP = 11022;
- /// <summary>
- /// 鍙栨秷
- /// </summary>
- public const int Cancel = 11023;
- /// <summary>
- /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
- /// </summary>
- public const int NoScene = 11024;
- /// <summary>
- /// 璁剧疆
- /// </summary>
- public const int Setting = 11025;
- /// <summary>
- /// 寤舵椂
- /// </summary>
- public const int Delay = 11026;
- /// <summary>
- /// 纭畾鍒犻櫎鍚楋紵
- /// </summary>
- public const int ConfirmDelete = 11027;
- /// <summary>
- /// 娣诲姞鍦烘櫙
- /// </summary>
- public const int AddScence = 11028;
- /// <summary>
- /// 鍦烘櫙鍚嶇О
- /// </summary>
- public const int SceneName = 11029;
- /// <summary>
- /// 璇疯緭鍏ュ満鏅悕绉�
- /// </summary>
- public const int PleaseInputSceneName = 11030;
- /// <summary>
- /// 娣诲姞鎵ц鐩爣
- /// </summary>
- public const int AddScentTargetAction = 11031;
- /// <summary>
- /// 閫夋嫨鍖哄煙
- /// </summary>
- public const int SelectZone = 11032;
- /// <summary>
- /// 閫夋嫨鍦烘櫙鍥剧墖
- /// </summary>
- public const int SelectScenePic = 11033;
+ /// <summary>
+ /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績涓�--璁惧绠＄悊澶勬坊鍔�
+ /// </summary>
+ public const int NoFunction = 11010;
+ /// <summary>
+ /// 缂栬緫
+ /// </summary>
+ public const int Edit = 11011;
+ /// <summary>
+ /// 璁剧疆鍔熻兘
+ /// </summary>
+ public const int FunctionSetting = 11012;
+ /// <summary>
+ /// 淇℃伅缂栬緫
+ /// </summary>
+ public const int EditInfo = 11013;
+ /// <summary>
+ /// 鍔熻兘鍚嶇О
+ /// </summary>
+ public const int FunctionName = 11014;
+ /// <summary>
+ /// 鎵�灞炲尯鍩�
+ /// </summary>
+ public const int BelongZone = 11015;
+ /// <summary>
+ /// 鎵�灞炴ā鍧�
+ /// </summary>
+ public const int BelongModel = 11016;
+ /// <summary>
+ /// 鏈煡
+ /// </summary>
+ public const int UNKnown = 11017;
+ /// <summary>
+ /// 鍒嗕韩
+ /// </summary>
+ public const int Share = 11018;
+ /// <summary>
+ /// 鍒嗕韩鐨�
+ /// </summary>
+ public const int Shared = 11019;
+ /// <summary>
+ /// 閫夋嫨鍥炬爣
+ /// </summary>
+ public const int SelectIcon = 11020;
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ public const int Save = 11021;
+ /// <summary>
+ /// 鎻愮ず
+ /// </summary>
+ public const int TIP = 11022;
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
+ public const int Cancel = 11023;
+ /// <summary>
+ /// 娌℃湁鍦烘櫙 {\r\n} 璇风偣鍑诲彸涓婅娣诲姞
+ /// </summary>
+ public const int NoScene = 11024;
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
+ public const int Setting = 11025;
+ /// <summary>
+ /// 寤舵椂
+ /// </summary>
+ public const int Delay = 11026;
+ /// <summary>
+ /// 纭畾鍒犻櫎鍚楋紵
+ /// </summary>
+ public const int ConfirmDelete = 11027;
+ /// <summary>
+ /// 娣诲姞鍦烘櫙
+ /// </summary>
+ public const int AddScence = 11028;
+ /// <summary>
+ /// 鍦烘櫙鍚嶇О
+ /// </summary>
+ public const int SceneName = 11029;
+ /// <summary>
+ /// 璇疯緭鍏ュ満鏅悕绉�
+ /// </summary>
+ public const int PleaseInputSceneName = 11030;
+ /// <summary>
+ /// 娣诲姞鎵ц鐩爣
+ /// </summary>
+ public const int AddScentTargetAction = 11031;
+ /// <summary>
+ /// 閫夋嫨鍖哄煙
+ /// </summary>
+ public const int SelectZone = 11032;
+ /// <summary>
+ /// 閫夋嫨鍦烘櫙鍥剧墖
+ /// </summary>
+ public const int SelectScenePic = 11033;
#region 璁惧绫诲瀷
/// <summary>
@@ -892,82 +893,82 @@
/// </summary>
public const int RoomList = 13100;
- /// <summary>
- /// 閫夋嫨妤煎眰
- /// </summary>
- public const int SelectFloor = 13101;
- /// <summary>
- /// 閫夋嫨浣忓畢
- /// </summary>
- public const int ChangeHome = 13102;
- /// <summary>
- /// 鏂扮敤鎴风櫥褰曪紝璇峰厛缁戝畾缃戝叧
- /// </summary>
- public const int NewAccountNeedBingGW = 13103;
- /// <summary>
- /// 娣诲姞鏅鸿兘缃戝叧
- /// </summary>
- public const int AddSmartGW = 13104;
- /// <summary>
- /// 缂栬緫鎴块棿
- /// </summary>
- public const int EditRoom = 13105;
- /// <summary>
- /// 鎴块棿鍚嶇О
- /// </summary>
- public const int RoomName = 13106;
- /// <summary>
- /// 鎵�灞炴ゼ灞�
- /// </summary>
- public const int BelongFloor = 13107;
- /// <summary>
- /// 娓╁害
- /// </summary>
- public const int Temperature = 13108;
- /// <summary>
- /// 婀垮害
- /// </summary>
- public const int Humidity = 13109;
- /// <summary>
- /// 褰撳墠
- /// </summary>
- public const int Current = 13110;
- /// <summary>
- /// 寮�
- /// </summary>
- public const int Open = 13111;
- /// <summary>
- /// 鍏抽棴
- /// </summary>
- public const int Close = 13112;
- /// <summary>
- /// 涓嶅紑鍚�
- /// </summary>
- public const int NotOpen = 13113;
- /// <summary>
- /// 绉�
- /// </summary>
- public const int Second = 13114;
- /// <summary>
- /// 鍒嗛挓
- /// </summary>
- public const int Minute = 13115;
- /// <summary>
- /// 灏忔椂
- /// </summary>
- public const int Hour = 13116;
- /// <summary>
- /// 鏈垎閰�
- /// </summary>
- public const int Unallocated = 13117;
- /// <summary>
- /// 鍏ㄩ��
- /// </summary>
- public const int AllSelect = 13118;
- /// <summary>
- /// 娣诲姞鍒�
- /// </summary>
- public const int AddTo = 13119;
+ /// <summary>
+ /// 閫夋嫨妤煎眰
+ /// </summary>
+ public const int SelectFloor = 13101;
+ /// <summary>
+ /// 閫夋嫨浣忓畢
+ /// </summary>
+ public const int ChangeHome = 13102;
+ /// <summary>
+ /// 鏂扮敤鎴风櫥褰曪紝璇峰厛缁戝畾缃戝叧
+ /// </summary>
+ public const int NewAccountNeedBingGW = 13103;
+ /// <summary>
+ /// 娣诲姞鏅鸿兘缃戝叧
+ /// </summary>
+ public const int AddSmartGW = 13104;
+ /// <summary>
+ /// 缂栬緫鎴块棿
+ /// </summary>
+ public const int EditRoom = 13105;
+ /// <summary>
+ /// 鎴块棿鍚嶇О
+ /// </summary>
+ public const int RoomName = 13106;
+ /// <summary>
+ /// 鎵�灞炴ゼ灞�
+ /// </summary>
+ public const int BelongFloor = 13107;
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const int Temperature = 13108;
+ /// <summary>
+ /// 婀垮害
+ /// </summary>
+ public const int Humidity = 13109;
+ /// <summary>
+ /// 褰撳墠
+ /// </summary>
+ public const int Current = 13110;
+ /// <summary>
+ /// 寮�
+ /// </summary>
+ public const int Open = 13111;
+ /// <summary>
+ /// 鍏抽棴
+ /// </summary>
+ public const int Close = 13112;
+ /// <summary>
+ /// 涓嶅紑鍚�
+ /// </summary>
+ public const int NotOpen = 13113;
+ /// <summary>
+ /// 绉�
+ /// </summary>
+ public const int Second = 13114;
+ /// <summary>
+ /// 鍒嗛挓
+ /// </summary>
+ public const int Minute = 13115;
+ /// <summary>
+ /// 灏忔椂
+ /// </summary>
+ public const int Hour = 13116;
+ /// <summary>
+ /// 鏈垎閰�
+ /// </summary>
+ public const int Unallocated = 13117;
+ /// <summary>
+ /// 鍏ㄩ��
+ /// </summary>
+ public const int AllSelect = 13118;
+ /// <summary>
+ /// 娣诲姞鍒�
+ /// </summary>
+ public const int AddTo = 13119;
/// <summary>
/// 璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
/// </summary>
@@ -1088,7 +1089,7 @@
/// <summary>
/// 閫夋嫨鎽嗛
/// </summary>
- public const int SelectSwing=13500;
+ public const int SelectSwing = 13500;
/// <summary>
/// 鑷姩
/// </summary>
@@ -1120,106 +1121,106 @@
-
-
-
- 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 OK = 10005;
- //*****public static readonly int ForgotPassword = 11002;
+ public static readonly int AccountOrPasswordCanNotBeEmpty = 10006;
+
+ public static readonly int IncorrectMailboxformat = 10008;
+ public static readonly int PasswordLengthIsLessThanSix = 10009;
- 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 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 BackToLogin = 11015;
+ public static readonly int PleaseInputPhoneNumberOrEmail = 11000;
- 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 ForgotPassword = 11002;
- public static readonly int Logining = 11024;
- public static readonly int AddRoom = 11026;
+ 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 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 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 ConfirmAdd = 11052;
- public static readonly int Add = 11054;
- public static readonly int DeviceSetting = 11055;
+ 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 AddDeviceSuccess = 11058;
+ public static readonly int HadSameRoom = 11037;
+ //*****public static readonly int Function = 11038;
- public static readonly int Device = 11060;
- public static readonly int ConfirmDeleteThisRoom = 11062;
+
+ 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;
@@ -1228,41 +1229,41 @@
- public static readonly int NextStep = 11071;
- public static readonly int SelectRoom = 11072;
- public static readonly int SelectDevice = 11073;
+ 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 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;
-
+
+ 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;
+
@@ -1271,154 +1272,154 @@
/// </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>
+ /// 鍙栨秷鏀惰棌
+ /// </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;
+ /// <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 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;
+ 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>
+ /// 鍦烘櫙涓凡鍖呭惈璇ュ満鏅�
+ /// </summary>
+ public static readonly int ThisSceneHadTheScene = 12032;
+ /// <summary>
+ /// 褰撳墠娌℃悳绱㈠埌缃戝叧锛岃鍏堟坊鍔犵綉鍏�
+ /// </summary>
+ public static readonly int NoGateway = 12033;
+ /// <summary>
+ ///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
+ /// </summary>
+ public static readonly int NoDeviceCanAddToRoom = 12034;
- /// <summary>
- /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
- /// </summary>
- public const int PswLengthMsg = 15000;
+
+
+
+ /// <summary>
+ /// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
+ /// </summary>
+ public static readonly int TheRoomNoDeviceAddToScene = 12500;
+
+ /// <summary>
+ /// 寰�涓婄Щ鍔�
+ /// </summary>
+ public static readonly int RollerShadeUp = 12501;
+ /// <summary>
+ /// 寰�涓嬬Щ鍔�
+ /// </summary>
+ public static readonly int RollerShadeDown = 12502;
+
+
+ /// <summary>
+ /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+ /// </summary>
+ public const int PswLengthMsg = 15000;
/// <summary>
/// 1涓皬鍐欏瓧姣�
/// </summary>
@@ -3222,7 +3223,7 @@
/// <summary>
/// 鍗忚皟鍣�
/// </summary>
- public const int uCoordinator= 15514;
+ public const int uCoordinator = 15514;
/// <summary>
/// 铏氭嫙椹卞姩
/// </summary>
@@ -4718,7 +4719,7 @@
/// <summary>
/// 璺宠浆鍒扮Щ鍔ㄨ澶�
/// </summary>
- public const int uJumpToMobileDevice= 15905;
+ public const int uJumpToMobileDevice = 15905;
/// <summary>
/// WLAN璁剧疆杩炴帴瀹跺涵WiFi
/// </summary>
--
Gitblit v1.8.0