From 42c1607f42ddcfd68fee1d62bbd28b3ddfd2f67e Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 22 十一月 2019 18:00:15 +0800
Subject: [PATCH] 2019.11.22-1
---
ZigbeeApp/Shared/R.cs | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 258 insertions(+), 34 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index e922717..f4214e5
--- 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;
@@ -288,6 +288,24 @@
public readonly static int ModifyTempPasswordTip2 = 201;
public readonly static int FirstFloor = 202;
public readonly static int GwResponseOvertime = 203;
+ public readonly static int CloudServerResponseOvertime = 204;
+ public readonly static int SureToFreezeAccount = 205;
+ public readonly static int FreezeFailed = 206;
+ public readonly static int UnFreezeFailed = 207;
+ public readonly static int DoorLockShare = 208;
+ public readonly static int EntryCurrentUnlockMethod = 209;
+ public readonly static int SureGiveAccessToSubaccount = 210;
+ 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;
@@ -556,11 +574,15 @@
public readonly static int selecfoolr = 5368;
- #region 鐧诲綍娉ㄥ唽
- /// <summary>
- /// HDL Home
- /// </summary>
- public const int AppName = 10000;
+ #region 鐧诲綍娉ㄥ唽
+ /// <summary>
+ /// HDL Home
+ /// </summary>
+ public const int AppName = 10000;
+ /// <summary>
+ /// 甯哥敤
+ /// </summary>
+ public const int Favorite = 10001;
/// <summary>
@@ -1062,16 +1084,50 @@
/// 鎴戠殑鐩稿唽
/// </summary>
public const int MyAblums = 13148;
+ /// <summary>
+ /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
+ /// </summary>
+ public const int TheSceneIsDelaying = 13149;
+
+ /// <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
- /// <summary>
- /// 鍠滅埍
- /// </summary>
- public static readonly int Favorite = 100000;
+
public static readonly int OK = 10005;
@@ -1667,10 +1723,6 @@
/// </summary>
public const int uCurtainMotor = 15079;
/// <summary>
- /// 瀹夐槻鍔熻兘
- /// </summary>
- public const int uSecurityFunction = 15084;
- /// <summary>
/// 璁惧绫诲瀷
/// </summary>
public const int uDeviceType = 15085;
@@ -2055,9 +2107,9 @@
/// </summary>
public const int uSharedDevice = 15083;
/// <summary>
- /// 鍏变韩鎴块棿
+ /// 鏈垎閰�
/// </summary>
- public const int uSharedRoom = 15084;
+ public const int uUnallocated = 15084;
/// <summary>
/// 閰嶇疆鍏变韩璁惧
/// </summary>
@@ -2155,9 +2207,9 @@
/// </summary>
public const int uDownLoadAndRecoverMsg = 15221;
/// <summary>
- /// 纭畾瑕佸垹闄ゆ枃浠跺悧锛�
+ /// 纭鍒犻櫎璇ュ浠芥暟鎹�?
/// </summary>
- public const int uDoDeleteFileMsg = 15222;
+ public const int uDoDeleteBackupMsg = 15222;
/// <summary>
/// 娣诲姞澶囦唤
/// </summary>
@@ -3203,9 +3255,9 @@
/// </summary>
public const int uGatewayType = 15520;
/// <summary>
- /// 璁惧纭欢鐗堟湰
+ /// 纭欢鐗堟湰
/// </summary>
- public const int uDeviceHardwareVersion = 15521;
+ public const int uHardwareVersion = 15521;
/// <summary>
/// 缃戝叧鍥轰欢鐗堟湰
/// </summary>
@@ -3231,9 +3283,9 @@
/// </summary>
public const int uDeviceImageId = 15527;
/// <summary>
- /// 缃戝叧闀滃儚ID
+ /// 闀滃儚ID
/// </summary>
- public const int uGatewayImageId = 15528;
+ public const int uImageId = 15528;
/// <summary>
/// 铏氭嫙椹卞姩闀滃儚ID
/// </summary>
@@ -3305,7 +3357,7 @@
/// <summary>
/// 鍥轰欢鏃ユ湡
/// </summary>
- public const int uGatewayHardwareDate = 15548;
+ public const int uHardwareDate = 15548;
/// <summary>
/// 娌℃湁鍙戠幇鏂扮綉鍏�,璇锋鏌ョ綉鍏抽摼鎺ユ槸鍚︽甯�
/// </summary>
@@ -3523,17 +3575,9 @@
/// </summary>
public const int uPleaseSelectNetwork = 15614;
/// <summary>
- /// 鍚� 绉�
+ /// 璇疯緭鍏iFi瀵嗙爜
/// </summary>
- public const int uNameHadSpace = 15615;
- /// <summary>
- /// 瀵� 鐮�
- /// </summary>
- public const int uPasswordHadSpace = 15616;
- /// <summary>
- /// 璇疯緭鍏ョ綉缁滃瘑鐮�
- /// </summary>
- public const int uPleaseInputNetworkPassword = 15617;
+ public const int uPleaseInputWifiPassword = 15617;
/// <summary>
/// 瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
/// </summary>
@@ -4650,6 +4694,186 @@
/// 鑳佽揩瀵嗙爜璁剧疆鎴愬姛
/// </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>
--
Gitblit v1.8.0