From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/R.cs | 461 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 364 insertions(+), 97 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 272f03e..50223a7 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -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 DoorLockFunctionSetting = 44;
public static readonly int RandomPasword = 45;
public static readonly int DoolockMonth = 46;
public static readonly int DoorlockDay = 47;
@@ -272,7 +272,7 @@
public readonly static int Year = 185;
public readonly static int RectifySuccess = 186;
public readonly static int RectifyFailed = 187;
- public readonly static int SetTempPasswordTip2 = 188;
+ public readonly static int SetTempPasswordTip = 188;
public readonly static int SetTempPasswordTip3 = 189;
public readonly static int SetTempPasswordTip4 = 190;
public readonly static int SetTempPasswordTip5 = 191;
@@ -295,10 +295,17 @@
public readonly static int DoorLockShare = 208;
public readonly static int EntryCurrentUnlockMethod = 209;
public readonly static int SureGiveAccessToSubaccount = 210;
- public readonly static int GiveAccessToSubaccountSuccess = 211;
+ public readonly static int CancelAccessToSubaccountFailed = 211;
public readonly static int GiveAccessToSubaccountFailed = 212;
public readonly static int AccountIsFreezed = 213;
public readonly static int NoAccess = 214;
+ public readonly static int NoFiftySeconds = 215;
+ public readonly static int VerifyFailed = 216;
+ public readonly static int UnlockSuccess = 217;
+ public readonly static int AddFailed = 218;
+ public readonly static int UnlockFailed = 219;
+ public readonly static int DoorlockPasswordDispear = 220;
+ public readonly static int BindUnknownError = 221;
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -1077,6 +1084,36 @@
/// 鎴戠殑鐩稿唽
/// </summary>
public const int MyAblums = 13148;
+
+ /// <summary>
+ /// 閫夋嫨鎽嗛
+ /// </summary>
+ public const int SelectSwing=13500;
+ /// <summary>
+ /// 鑷姩
+ /// </summary>
+ public const int Swing_Auto = 13501;
+ /// <summary>
+ /// 1鎸�
+ /// </summary>
+ public const int Swing_First = 13502;
+ /// <summary>
+ /// 2鎸�
+ /// </summary>
+ public const int Swing_Second = 13503;
+ /// <summary>
+ /// 3鎸�
+ /// </summary>
+ public const int Swing_Thrid = 13504;
+ /// <summary>
+ /// 4鎸�
+ /// </summary>
+ public const int Swing_Fourth = 13505;
+ /// <summary>
+ /// 5鎸�
+ /// </summary>
+ public const int Swing_Fifth = 13506;
+
#endregion
@@ -2114,102 +2151,102 @@
/// 璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�
/// </summary>
public const int uSubAccountLevelIsUp = 15196;
- /// <summary>
- /// 纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵
+ /// <summary>
+ /// 纭畾瑕佺Щ闄よ瀹跺涵鎴愬憳鍚楋紵
/// </summary>
- public const int uConfirmRemoveMember = 15197;
- /// <summary>
- /// 鍒锋柊
+ public const int uConfirmRemoveMember = 15197;
+ /// <summary>
+ /// 鍒锋柊
/// </summary>
- public const int uRefresh = 15198;
- /// <summary>
- /// 鏈垎閰嶅尯鍩�
+ public const int uRefresh = 15198;
+ /// <summary>
+ /// 鏈垎閰嶅尯鍩�
/// </summary>
- public const int uDeviceNotAssignedRoom = 15199;
- /// <summary>
- /// 鍒涘缓浣忓畢
+ public const int uDeviceNotAssignedRoom = 15199;
+ /// <summary>
+ /// 鍒涘缓浣忓畢
/// </summary>
- public const int uCreatResidence = 15200;
- /// <summary>
- /// 缂栬緫浣忓畢
+ public const int uCreatResidence = 15200;
+ /// <summary>
+ /// 缂栬緫浣忓畢
/// </summary>
- public const int uEditorResidence = 15201;
- /// <summary>
- /// 璇疯緭鍏ヤ綇瀹呭悕绉�
- /// </summary>
- public const int uPleaseInputResidenceName = 15202;
- /// <summary>
- /// 涓嶈兘鍒犻櫎鏈�鍚庡敮涓�鐨勪綇瀹�
- /// </summary>
- public const int uDoNotDeleteLastResidence = 15203;
- /// <summary>
- /// 鍋滄閰嶇疆
- /// </summary>
- public const int uBreakSettion = 15204;
- /// <summary>
- /// 杈撳叆瀹夐槻瀵嗙爜
- /// </summary>
- public const int uInputSafetyPassword = 15205;
- /// <summary>
- /// 瀹夐槻瀵嗙爜杈撳叆閿欒
- /// </summary>
- public const int uInputSafetyPasswordIsError = 15206;
- /// <summary>
- /// 澶囦唤杩樺師
- /// </summary>
- public const int uBackupAndRecover = 15220;
- /// <summary>
- /// 鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛�
- /// </summary>
- public const int uDownLoadAndRecoverMsg = 15221;
- /// <summary>
- /// 纭畾瑕佸垹闄ゆ枃浠跺悧锛�
- /// </summary>
- public const int uDoDeleteFileMsg = 15222;
- /// <summary>
- /// 娣诲姞澶囦唤
- /// </summary>
- public const int uAddBackup = 15223;
- /// <summary>
- /// 缂栬緫澶囦唤
- /// </summary>
- public const int uEditorBackup = 15224;
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public const int uBackup = 15225;
- /// <summary>
- /// 璇疯緭鍏ュ娉ㄥ悕绉�
- /// </summary>
- public const int uPleaseInpuBackup = 15226;
- /// <summary>
- /// 鎭㈠鏂囦欢鎴愬姛
- /// </summary>
- public const int uFileRecoverSuccess = 15227;
- /// <summary>
- /// 鎶ヨ鐩爣璁剧疆
- /// </summary>
- public const int uAlarmTargetSettion = 15246;
- /// <summary>
- /// 褰撹闃插尯鎶ヨ鏃讹紝浠ヤ笅鐩爣灏嗕細鍝嶅簲
- /// </summary>
- public const int uTargetViewAlarmAfterZoonAlarm = 15247;
- /// <summary>
- /// 鎺ㄩ�侀�氱煡
- /// </summary>
- public const int uInformationPush = 15248;
- /// <summary>
- /// 娣诲姞鐩爣
- /// </summary>
- public const int uAddTarget = 15249;
- /// <summary>
- /// 娣诲姞鎶ヨ鐩爣
- /// </summary>
- public const int uAddAlarmTarget = 15250;
- /// <summary>
- /// 鍒楄〃
- /// </summary>
- public const int uList = 15251;
+ public const int uEditorResidence = 15201;
+ /// <summary>
+ /// 璇疯緭鍏ヤ綇瀹呭悕绉�
+ /// </summary>
+ public const int uPleaseInputResidenceName = 15202;
+ /// <summary>
+ /// 涓嶈兘鍒犻櫎鏈�鍚庡敮涓�鐨勪綇瀹�
+ /// </summary>
+ public const int uDoNotDeleteLastResidence = 15203;
+ /// <summary>
+ /// 鍋滄閰嶇疆
+ /// </summary>
+ public const int uBreakSettion = 15204;
+ /// <summary>
+ /// 杈撳叆瀹夐槻瀵嗙爜
+ /// </summary>
+ public const int uInputSafetyPassword = 15205;
+ /// <summary>
+ /// 瀹夐槻瀵嗙爜杈撳叆閿欒
+ /// </summary>
+ public const int uInputSafetyPasswordIsError = 15206;
+ /// <summary>
+ /// 澶囦唤杩樺師
+ /// </summary>
+ public const int uBackupAndRecover = 15220;
+ /// <summary>
+ /// 鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛�
+ /// </summary>
+ public const int uDownLoadAndRecoverMsg = 15221;
+ /// <summary>
+ /// 纭鍒犻櫎璇ュ浠芥暟鎹�?
+ /// </summary>
+ public const int uDoDeleteBackupMsg = 15222;
+ /// <summary>
+ /// 娣诲姞澶囦唤
+ /// </summary>
+ public const int uAddBackup = 15223;
+ /// <summary>
+ /// 缂栬緫澶囦唤
+ /// </summary>
+ public const int uEditorBackup = 15224;
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public const int uBackup = 15225;
+ /// <summary>
+ /// 璇疯緭鍏ュ娉ㄥ悕绉�
+ /// </summary>
+ public const int uPleaseInpuBackup = 15226;
+ /// <summary>
+ /// 鎭㈠鏂囦欢鎴愬姛
+ /// </summary>
+ public const int uFileRecoverSuccess = 15227;
+ /// <summary>
+ /// 鎶ヨ鐩爣璁剧疆
+ /// </summary>
+ public const int uAlarmTargetSettion = 15246;
+ /// <summary>
+ /// 褰撹闃插尯鎶ヨ鏃讹紝浠ヤ笅鐩爣灏嗕細鍝嶅簲
+ /// </summary>
+ public const int uTargetViewAlarmAfterZoonAlarm = 15247;
+ /// <summary>
+ /// 鎺ㄩ�侀�氱煡
+ /// </summary>
+ public const int uInformationPush = 15248;
+ /// <summary>
+ /// 娣诲姞鐩爣
+ /// </summary>
+ public const int uAddTarget = 15249;
+ /// <summary>
+ /// 娣诲姞鎶ヨ鐩爣
+ /// </summary>
+ public const int uAddAlarmTarget = 15250;
+ /// <summary>
+ /// 鍒楄〃
+ /// </summary>
+ public const int uList = 15251;
/// <summary>
/// 璇疯緭鍏ョ敤鎴峰悕绉�
/// </summary>
@@ -3785,9 +3822,239 @@
/// <summary>
/// 瀹氫綅
/// </summary>
- public const int uFixedPosition = 15681;
+ 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;
+ /// <summary>
+ /// 鑾峰彇绌鸿皟妯″紡澶辫触
+ /// </summary>
+ public const int uGetAcModeFail = 15898;
+ /// <summary>
+ /// 璁剧疆绌鸿皟妯″紡澶辫触
+ /// </summary>
+ public const int uSetAcModeFail = 15899;
+ /// <summary>
+ /// 缁х画娣诲姞缃戝叧
+ /// </summary>
+ public const int uContinuteToAddGateway = 15900;
+ /// <summary>
+ /// 杩斿洖涓婚〉
+ /// </summary>
+ public const int uGobackToHomePage = 15901;
+ /// <summary>
+ /// 娣诲姞鏅鸿兘缃戝叧鎴愬姛
+ /// </summary>
+ public const int uAddgatewaySuccess = 15902;
+ /// <summary>
+ /// UDP妯″紡(鎺ㄨ崘)
+ /// </summary>
+ public const int uUdpModeRecommend = 15903;
+ /// <summary>
+ /// AP妯″紡
+ /// </summary>
+ public const int uApMode = 15904;
+ /// <summary>
+ /// 璺宠浆鍒扮Щ鍔ㄨ澶�
+ /// </summary>
+ public const int uJumpToMobileDevice= 15905;
+ /// <summary>
+ /// WLAN璁剧疆杩炴帴瀹跺涵WiFi
+ /// </summary>
+ public const int uWlanConnectHomeWifi = 15906;
+ /// <summary>
+ /// 闀挎寜缃戝叧HID/WCFG鎸夐敭20绉抺0}绯荤粺鐏揩闂�60绉掑垯杩涘叆閰嶇綉鐘舵�亄0}绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// </summary>
+ public const int uAddUdpWirelessGatewayMsg = 15907;
+ /// <summary>
+ /// 闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// </summary>
+ public const int uAddApWirelessGatewayMsg1 = 15908;
+ /// <summary>
+ /// 璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆{0}閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// </summary>
+ public const int uAddApWirelessGatewayMsg2 = 15909;
+ /// <summary>
+ /// 璇疯緭鍏ュ搴璚IFI璐﹀彿
+ /// </summary>
+ public const int uPleaseInputHomeWifiAccount = 15910;
+ /// <summary>
+ /// 璇峰墠寰�绉诲姩璁惧WLAN璁剧疆{0}閲嶆柊杩炴帴瀹跺涵wiFi
+ /// </summary>
+ public const int uAddApWirelessGatewayMsg3 = 15911;
+ /// <summary>
+ /// 绯荤粺鐏瘡绉掗棯鐑佷竴娆0}鍒欒繛鎺ユ垚鍔�
+ /// </summary>
+ public const int uAddApWirelessGatewayMsg4 = 15912;
+ /// <summary>
+ /// 閫夋嫨鍦扮偣
+ /// </summary>
+ public const int uSelectAdrress = 15915;
/// <summary>
- /// 鎸夐敭璁剧疆
+ /// 鎮ㄧ殑鍙嶉鍜屾剰瑙佷細璁╂垜浠彉寰楁洿濂�
+ /// </summary>
+ public const int uYouSuggestionMsg = 15916;
+ /// <summary>
+ /// 鍙嶉绫诲瀷
+ /// </summary>
+ public const int uSuggestionType = 15917;
+ /// <summary>
+ /// 浼樺寲
+ /// </summary>
+ public const int uOptimization = 15918;
+ /// <summary>
+ /// 鏂伴渶姹�
+ /// </summary>
+ public const int uNewDemand = 15919;
+ /// <summary>
+ /// 閭鍦板潃
+ /// </summary>
+ public const int uEmailAddress = 15920;
+ /// <summary>
+ /// 璇疯緭鍏ユ偍鐨勯偖绠卞湴鍧�
+ /// </summary>
+ public const int uPleaseInputYouEmailAddress = 15921;
+ /// <summary>
+ /// 鎻愪氦
+ /// </summary>
+ public const int uSubmit = 15922;
+ /// <summary>
+ /// 鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚
+ /// </summary>
+ public const int uSubmitSuccessMsg = 15923;
+ /// <summary>
+ /// 涓婁紶
+ /// </summary>
+ public const int uUpload = 15924;
+ /// <summary>
+ /// 鑷姩澶囦唤
+ /// </summary>
+ public const int uAutoBackup = 15925;
+ /// <summary>
+ /// 浠婃棩鎻愪氦娆℃暟宸蹭笂闄�
+ /// </summary>
+ public const int uSubmitCountIsOverMsg = 15926;
+ /// <summary>
+ /// 鑾峰彇缃戝叧淇￠亾澶辫触
+ /// </summary>
+ public const int uGetGatewayChannelIdFail = 15927;
+ /// <summary>
+ /// 鑾峰彇鍗忚皟鍣∕ac澶辫触
+ /// </summary>
+ public const int uGetGatewayCoordinatorMacFail = 15928;
+ /// <summary>
+ /// 鑾峰彇鍗忚皟鍣≒anID澶辫触
+ /// </summary>
+ public const int uGetGatewayPanIDFail = 15929;
+ /// <summary>
+ /// 涓婁紶鏁版嵁鑷充簯绔�
+ /// </summary>
+ public const int uUploadDataToDb = 15930;
+ /// <summary>
+ /// 浠庝簯绔笅杞芥暟鎹�
+ /// </summary>
+ public const int uDwonloadDataFromDb = 15931;
+ /// <summary>
+ /// 涓婁紶鏁版嵁
+ /// </summary>
+ public const int uUploadData = 15932;
+ /// <summary>
+ /// 涓婁紶鏁版嵁鎴愬姛
+ /// </summary>
+ public const int uUploadDataSuccess = 15933;
+ /// <summary>
+ /// 涓嬭浇鏁版嵁
+ /// </summary>
+ public const int uDwonloadData = 15934;
+ /// <summary>
+ /// 涓嬭浇
+ /// </summary>
+ public const int uDownLoad = 15935;
+ /// <summary>
+ /// 璁剧疆缃戝叧缁忕含搴﹀け璐�
+ /// </summary>
+ public const int uSetGatewaySiteFail = 15936;
+ /// <summary>
+ /// 姝ｅ湪淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅
+ /// </summary>
+ public const int uGatewayNVFileSaving = 15937;
+ /// <summary>
+ /// 淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅澶辫触
+ /// </summary>
+ public const int uSaveGatewayNVFileFail = 15938;
+ /// <summary>
+ /// 鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳藉け璐�
+ /// </summary>
+ public const int uOpenZbMsComSendFail = 15939;
+ /// <summary>
+ /// 缃戝叧鏁版嵁澶囦唤澶辫触
+ /// </summary>
+ public const int uBackupgatewayDataFail = 15940;
+ /// <summary>
+ /// 寮�濮嬪浠界綉鍏虫暟鎹�
+ /// </summary>
+ public const int uStartBackupgatewayData = 15941;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,缃戝叧鏁版嵁澶囦唤澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndBackupgatewayDataFail = 15942;
+ /// <summary>
+ /// 鍒涘缓澶囦唤鏂囦欢
+ /// </summary>
+ public const int uCreatBackupFile = 15943;
+ /// <summary>
+ /// 姝ｅ湪鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
+ /// </summary>
+ public const int uZbMsComSendOpening = 15944;
+
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
+ /// <summary>
+ /// 鎸囧畾缃戝叧宸茬粡琚粦瀹�
+ /// </summary>
+ public const int BindGwToHome_BindGatewaysExists = 18004;
+ /// <summary>
+ /// 鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
+ /// </summary>
+ public const int BindSubAccount_NoExist = 18005;
+ /// <summary>
+ /// 璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
/// </summary>
public const int uPanelSettion = 15682;
/// <summary>
@@ -5053,4 +5320,4 @@
/// </summary>
public const int uDeviceBelongId12 = 40013;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0