From 2ed75b8b337048e5d75e6d9ec8307633134f02fd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 10 十月 2019 11:33:04 +0800
Subject: [PATCH] 个人中心添加楼层和创建房间，实装二级验证
---
ZigbeeApp/Shared/R.cs | 460 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 400 insertions(+), 60 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 1a57db1..23619fa 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -89,7 +89,7 @@
public readonly static int ModeType = 19;
public readonly static int BindDevice = 20;
public readonly static int BindScene = 21;
- public readonly static int Save = 22;
+ //public readonly static int Save = 22;
public readonly static int RemoveSuccess = 23;
public readonly static int RemoveFailed = 24;
public readonly static int ModeConfigureFailed = 25;
@@ -115,7 +115,7 @@
public readonly static int Ac = 42;
public readonly static int SneneModeExistTargets = 43;
//闂ㄩ攣
- public static readonly int FunctionSetting = 44;
+ //public static readonly int FunctionSetting = 44;
public static readonly int RandomPasword = 45;
public static readonly int DoolockMonth = 46;
public static readonly int DoorlockDay = 47;
@@ -492,29 +492,291 @@
+ #region 鐧诲綍娉ㄥ唽
/// <summary>
- /// 鍠滅埍
+ /// HDL Home
/// </summary>
- public static readonly int Favorite = 10000;
+ public const int AppName = 10000;
- public static readonly int RequestServerFailed = 10003;
- public static readonly int OK = 10005;
- public static readonly int AccountOrPasswordCanNotBeEmpty = 10006;
- public static readonly int AccountHasBeenRegistered = 10007;
- public static readonly int IncorrectMailboxformat = 10008;
- public static readonly int PasswordLengthIsLessThanSix = 10009;
+ /// <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 static readonly int TwoPasswordInconsistency = 10010;
+ 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;
+
+
+ #endregion
+
+ #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 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>
+ /// 娌℃湁鍦烘櫙 \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;
+
+
+ #endregion
+
+
+
+ #region 涓婚〉
+
+ /// <summary>
+ /// 鎴块棿鍒楄〃
+ /// </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;
+
+
+ #endregion
+
+
+ /// <summary>
+ /// 鍠滅埍
+ /// </summary>
+ public static readonly int Favorite = 100000;
+
+
+ public static readonly int OK = 10005;
+
+ public static readonly int AccountOrPasswordCanNotBeEmpty = 10006;
+
+ public static readonly int IncorrectMailboxformat = 10008;
+ public static readonly int PasswordLengthIsLessThanSix = 10009;
+
public static readonly int ThePasswordIsEmpty = 10011;
public static readonly int PleaseGoToTheMailboxToActivateTheAccountNumber = 10012;
public static readonly int PleaseInputTheCorrectCellPhoneNumber = 10013;
public static readonly int PleaseInputTheCorrectVerificationCode = 10014;
public static readonly int PleaseSelectAreaCode = 10015;
- public static readonly int LoginByCode = 10016;
+
public static readonly int ThePhoneNumberIsNotRegisteredYetPleaseRegisterFirst = 10017;
public static readonly int LoginCodeError = 10018;
public static readonly int ThisUserBelongsToDebugAccountAndIsNotEnabled = 10019;
@@ -538,71 +800,69 @@
public static readonly int PleaseInputPhoneNumberOrEmail = 11000;
- public static readonly int PleaseInputPWD = 11001;
+
//*****public static readonly int ForgotPassword = 11002;
- public static readonly int Login = 11003;
- public static readonly int Register = 11004;
+
+
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 PleaseInputPhoneNum = 11009;
- public static readonly int PleaseComfirePWD = 11010;
+
+
public static readonly int PleaseInputVerificationCode = 11011;
- public static readonly int SendVerificationCode = 11012;
- public static readonly int TIP = 11013;
- public static readonly int SendVerificationCodeSuccess = 11014;
+
+
+
public static readonly int BackToLogin = 11015;
- public static readonly int PleaseInputEmail = 11016;
+
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 LoginByAccountPWD = 11023;
+
public static readonly int Logining = 11024;
- public static readonly int RoomList = 11025;
+
public static readonly int AddRoom = 11026;
public static readonly int RoomName = 11027;
- public static readonly int Cancel = 11028;
- public static readonly int Confrim = 11029;
- public static readonly int Complete = 11030;
+
+
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 SelectPic = 11036;
+
public static readonly int HadSameRoom = 11037;
//*****public static readonly int Function = 11038;
- public static readonly int Scence = 11039;
+
public static readonly int EditRoom = 11040;
public static readonly int Delete = 11041;
public static readonly int AddFunction = 11042;
- public static readonly int AddScence = 11043;
+
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 BelongZone = 11050;
- public static readonly int Shared = 11051;
+
+
public static readonly int ConfirmAdd = 11052;
- public static readonly int BelongModel = 11053;
+
public static readonly int Add = 11054;
public static readonly int DeviceSetting = 11055;
- public static readonly int PleaseInputSceneName = 11056;
- public static readonly int AddRoomScentTargetAction = 11057;
+
public static readonly int AddDeviceSuccess = 11058;
public static readonly int Close = 11059;
public static readonly int Device = 11060;
- public static readonly int NoFunction = 11061;
+
public static readonly int ConfirmDeleteThisRoom = 11062;
- public static readonly int ConfirmDelete = 11063;
- public static readonly int NoScene = 11064;
- public static readonly int Automation = 11065;
+
+
+
@@ -619,8 +879,8 @@
public static readonly int ThisSceneHadTheDevice = 11076;
public static readonly int SceneNameCannotBeNull = 11077;
public static readonly int ModifyScene = 11078;
- public static readonly int SceneName = 11079;
- public static readonly int ChangeHome = 11080;
+
+
/// <summary>
/// 鏈縺娲�
/// </summary>
@@ -641,14 +901,8 @@
/// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
/// </summary>
public static readonly int ACCOUNTNOEXISTS = 11085;
- /// <summary>
- /// 鎻愪緵鐨勫弬鏁伴敊璇�
- /// </summary>
- public static readonly int PARAMETEROREMPTY = 11086;
- /// <summary>
- /// 楠岃瘉鐮侀敊璇�
- /// </summary>
- public static readonly int VALIDCODEANDPHONENOEQUAL = 11087;
+
+
public static readonly int YourPWDIsTooSample = 11088;
public static readonly int PleaseInputTheCorrectEmail = 11089;
/// <summary>
@@ -682,7 +936,6 @@
/// </summary>
public static readonly int Custom = 11098;
- public static readonly int Delay = 11100;
/// <summary>
/// 鍙栨秷鏀惰棌
/// </summary>
@@ -696,10 +949,7 @@
/// </summary>
public static readonly int Percent = 11103;
public static readonly int Success = 11104;
- /// <summary>
- /// 鏈煡
- /// </summary>
- public static readonly int UNKnown = 11105;
+
/// <summary>
/// The please confirm new password.
/// </summary>
@@ -800,10 +1050,7 @@
/// 鎮ㄧ殑璐﹀彿宸插湪鍙︿竴鍙拌澶囩櫥褰曪紝鎮ㄥ凡琚己鍒朵笅绾�
/// </summary>
public static readonly int YouHaveBeenSignOut = 12030;
- /// <summary>
- /// 缂栬緫
- /// </summary>
- public static readonly int Edit = 12031;
+
/// <summary>
/// 鍦烘櫙涓凡鍖呭惈璇ュ満鏅�
/// </summary>
@@ -1202,7 +1449,7 @@
/// <summary>
/// 鍔熻兘
/// </summary>
- public const int Function = 15070;
+ public const int uFunction = 15070;
/// <summary>
/// 鐏厜
/// </summary>
@@ -1680,9 +1927,9 @@
/// </summary>
public const int uDeviceNotAssignedRoom = 15199;
/// <summary>
- /// 娣诲姞浣忓畢
+ /// 鍒涘缓浣忓畢
/// </summary>
- public const int uAddResidence = 15200;
+ public const int uCreatResidence = 15200;
/// <summary>
/// 缂栬緫浣忓畢
/// </summary>
@@ -3627,6 +3874,87 @@
/// 娌℃湁璁剧疆瀵嗙爜楠岃瘉
/// </summary>
public const int uPasswordAuthenticationNotSettion = 15751;
+ /// <summary>
+ /// 褰撳墠浣忓畢
+ /// </summary>
+ public const int uNowResidence = 15752;
+ /// <summary>
+ /// 鍒囨崲
+ /// </summary>
+ public const int uSwitch1 = 15753;
+ /// <summary>
+ /// 鏇存敼
+ /// </summary>
+ public const int uChanged1 = 15754;
+ /// <summary>
+ /// 鏇存敼鍚嶇О
+ /// </summary>
+ public const int uChangedName = 15755;
+ /// <summary>
+ /// 纭鍒囨崲褰撳墠浣忓畢鍒般�寋0}銆�?
+ /// </summary>
+ public const int uSwitchResidenceMsg = 15756;
+ /// <summary>
+ /// 妤煎眰
+ /// </summary>
+ public const int uFloor = 15757;
+ /// <summary>
+ /// 鍒涘缓妤煎眰
+ /// </summary>
+ public const int uCreatFloor = 15758;
+ /// <summary>
+ /// 璇疯緭鍏ユゼ灞傚悕绉�
+ /// </summary>
+ public const int uPleaseInputFloorName = 15759;
+ /// <summary>
+ /// 妤煎眰鍚嶇О宸茬粡瀛樺湪
+ /// </summary>
+ public const int uFloorNameIsExist = 15760;
+ /// <summary>
+ /// 纭鍒犻櫎妤煎眰鍙婂叾鎵�鏈夋埧闂�?
+ /// </summary>
+ public const int uDeleteFloorMsg = 15761;
+ /// <summary>
+ /// 鍒犻櫎浣忓畢
+ /// </summary>
+ public const int uDeleteResidence = 15762;
+ /// <summary>
+ /// 纭鍒犻櫎浣忓畢鍙婃墍鏈夋ゼ灞傘�佹埧闂�?
+ /// </summary>
+ public const int uDeleteResidenceMsg = 15763;
+ /// <summary>
+ /// 纭鍒犻櫎鎴块棿?
+ /// </summary>
+ public const int uDeleteRoomMsg = 15764;
+ /// <summary>
+ /// 鍒涘缓鎴块棿
+ /// </summary>
+ public const int uCreatRoom = 15765;
+ /// <summary>
+ /// 鎴块棿鍚嶇О
+ /// </summary>
+ public const int uRoomName = 15766;
+ /// <summary>
+ /// 鎵�灞炴ゼ灞�
+ /// </summary>
+ public const int uBelongeFloor = 15767;
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const int uTemperature = 15768;
+ /// <summary>
+ /// 婀垮害
+ /// </summary>
+ public const int uHumidity = 15769;
+ /// <summary>
+ /// 璇疯緭鍏ユ埧闂村悕绉�
+ /// </summary>
+ public const int uPleaseInputRoomName = 15770;
+ /// <summary>
+ /// 缂栬緫鎴块棿
+ /// </summary>
+ public const int uEditorRoom = 15771;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -3937,5 +4265,17 @@
/// 鑷畾涔夎澶囨墍灞濱D涓�9鐨勭炕璇戝悕瀛楋細褰╃伅
/// </summary>
public const int uDeviceBelongId9 = 40010;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╂箍搴︿紶鎰熷櫒
+ /// </summary>
+ public const int uDeviceBelongId10 = 40011;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceBelongId11 = 40012;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceBelongId12 = 40013;
}
}
--
Gitblit v1.8.0