From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/R.cs | 291 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 249 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 990a82a..e922717 100755
--- 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,7 @@
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 RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -551,8 +552,8 @@
public readonly static int selectunlockingmode=5364;
public readonly static int lockaddaction = 5365;
public readonly static int linkageevent = 5366;
-
-
+ public readonly static int current = 5367;
+ public readonly static int selecfoolr = 5368;
#region 鐧诲綍娉ㄥ唽
@@ -670,6 +671,38 @@
/// 浣犵殑瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍
/// </summary>
public const int ResetScucessPleaseLogin = 10126;
+ /// <summary>
+ /// 璇烽�夋嫨鍖哄彿
+ /// </summary>
+ public const int PleaseSelectAreaCode = 10127;
+ /// <summary>
+ /// 鏈縺娲�
+ /// </summary>
+ public const int NOTVERIFY = 10128;
+ /// <summary>
+ /// 璇ョ敤鎴峰睘浜庤皟璇曡处鍙凤紝骞舵湭鍚敤
+ /// </summary>
+ public const int NOTENABLE = 10129;
+ /// <summary>
+ /// //鏁版嵁骞朵笉鍦ㄦHDL鍖哄煙鏈嶅姟鍣�
+ /// </summary>
+ public const int YOUDATANOISLOCALREGION = 10130;
+ /// <summary>
+ /// 璐﹀彿鎴栧瘑鐮侀敊璇�
+ /// </summary>
+ public const int USERNAMEORPWDERROR = 10131;
+ /// <summary>
+ /// 璐﹀彿涓嶅瓨鍦紝璇峰厛娉ㄥ唽
+ /// </summary>
+ public const int ACCOUNTNOEXISTS = 10132;
+ /// <summary>
+ /// 璇疯緭鍏ラ獙璇佺爜
+ /// </summary>
+ public const int PleaseInputVerificationCode = 10133;
+ /// <summary>
+ /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
+ /// </summary>
+ public const int LoginByWechat = 10134;
#endregion
@@ -1001,6 +1034,34 @@
/// 缂栬緫鍦烘櫙
/// </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
@@ -1025,7 +1086,7 @@
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;
@@ -1060,7 +1121,7 @@
public static readonly int LoginHadAccountPWD = 11008;
- public static readonly int PleaseInputVerificationCode = 11011;
+
@@ -1131,26 +1192,7 @@
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;
@@ -1192,7 +1234,7 @@
/// 鐧惧垎姣�
/// </summary>
public static readonly int Percent = 11103;
- public static readonly int Success = 11104;
+
/// <summary>
/// The please confirm new password.
@@ -1204,10 +1246,7 @@
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>
/// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
@@ -1760,9 +1799,9 @@
/// </summary>
public const int uSafetyPasswordSettion = 15119;
/// <summary>
- /// 鐢ㄦ埛瀵嗙爜
+ /// 瀹夐槻瀵嗙爜
/// </summary>
- public const int uUserPassword = 15120;
+ public const int uSafetyPassword = 15120;
/// <summary>
/// 鑳佽揩瀵嗙爜
/// </summary>
@@ -1824,7 +1863,7 @@
/// </summary>
public const int uContactInCoerceStatu = 15135;
/// <summary>
- /// 璇疯緭鍏ユ墜鏈哄彿鐮�
+ /// 璇疯緭鍏ユ墜鏈哄彿
/// </summary>
public const int uPleaseInputPhoneNumber = 15136;
/// <summary>
@@ -2052,7 +2091,7 @@
/// </summary>
public const int uUpSubAccountLevel = 15192;
/// <summary>
- /// 纭畾瑕佹挙閿�璇ユ垚鍛樼鐞嗘潈闄愬悧锛�
+ /// 纭畾鍙栨秷銆寋0}銆嶇鐞嗗憳鏉冮檺锛�
/// </summary>
public const int uDownSubAccountLevel = 15193;
/// <summary>
@@ -2060,13 +2099,13 @@
/// </summary>
public const int uMemberAuthorization = 15194;
/// <summary>
- /// 鎴愬憳鎺堟潈鎴愬姛
+ /// 鎺堟潈鎴愬姛!
/// </summary>
public const int uMemberAuthorizationSuccess = 15195;
/// <summary>
- /// 璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�,鎮ㄧ殑鎺у埗鏉冨凡绉讳氦
+ /// 璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�
/// </summary>
- public const int uSubAccountLevelIsUpAndLetAuthorization = 15196;
+ public const int uSubAccountLevelIsUp = 15196;
/// <summary>
/// 纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵
/// </summary>
@@ -2540,9 +2579,9 @@
/// </summary>
public const int uPleaseInputUserPassword = 15347;
/// <summary>
- /// 鐢ㄦ埛瀵嗙爜宸叉洿鏂�
+ /// 瀹夐槻瀵嗙爜璁剧疆鎴愬姛
/// </summary>
- public const int uUserPasswordRefreshMsg = 15348;
+ public const int uSetSafetyPasswordSuccess = 15348;
/// <summary>
/// 淇敼鐢ㄦ埛瀵嗙爜澶辫触
/// </summary>
@@ -3390,7 +3429,7 @@
/// <summary>
/// 鏃犲彲鍏变韩鐨勬埧闂�
/// </summary>
- public const int uNotShardDeviceInAllRoomMsg = 15583;
+ public const int uNotCanShardRoomMsg = 15583;
/// <summary>
/// 纭畾绉婚櫎閫変腑鐨勫満鏅紵
/// </summary>
@@ -4392,11 +4431,11 @@
/// </summary>
public const int uRoomList = 15842;
/// <summary>
- /// 杩樻病鏈夋坊鍔犲満鏅摝
+ /// 杩樻病鏈夋坊鍔犲満鏅�
/// </summary>
public const int uDoNotHadAddScenceMsg = 15843;
/// <summary>
- /// 杩樻病鏈夋坊鍔犺澶囧摝
+ /// 杩樻病鏈夋坊鍔犺澶�
/// </summary>
public const int uDoNotHadAddDeviceMsg = 15844;
/// <summary>
@@ -4443,6 +4482,174 @@
/// 鍏抽棴绌鸿皟澶辫触
/// </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}鍏朵粬鎻愮ず锛屽彧鍙戦�佷俊鎭埌鐗瑰畾鐨勬帴鏀惰��
+ /// </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;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0