From f8b647c263f068babb8efcc19ff4e74026a4bd28 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 03 十二月 2019 10:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/R.cs | 306 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 242 insertions(+), 64 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 36e3278..7eb0659 100644
--- 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;
@@ -879,6 +880,18 @@
/// 涓户鍣�
/// </summary>
public const int Repeater = 12109;
+ /// <summary>
+ /// 娓╁害浼犳劅鍣�
+ /// </summary>
+ public const int TemperatureSensor = 12110;
+ /// <summary>
+ /// 婀垮害浼犳劅鍣�
+ /// </summary>
+ public const int HumiditySensor = 12111;
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒
+ /// </summary>
+ public const int TemperatureAndHumiditySensor = 12112;
#endregion
@@ -1084,6 +1097,10 @@
/// 鎴戠殑鐩稿唽
/// </summary>
public const int MyAblums = 13148;
+ /// <summary>
+ /// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
+ /// </summary>
+ public const int TheSceneIsDelaying = 13149;
/// <summary>
/// 閫夋嫨鎽嗛
@@ -1113,6 +1130,11 @@
/// 5鎸�
/// </summary>
public const int Swing_Fifth = 13506;
+ /// <summary>
+ /// 璇锋竻娲佹护缃�
+ /// </summary>
+ public const int NeedCleanAC = 13511;
+
#endregion
@@ -4795,87 +4817,243 @@
/// 浠婃棩鎻愪氦娆℃暟宸蹭笂闄�
/// </summary>
public const int uSubmitCountIsOverMsg = 15926;
- /// <summary>
- /// 鑾峰彇缃戝叧淇￠亾澶辫触
+ /// <summary>
+ /// 鑾峰彇缃戝叧淇￠亾澶辫触
/// </summary>
- public const int uGetGatewayChannelIdFail = 15927;
- /// <summary>
- /// 鑾峰彇鍗忚皟鍣∕ac澶辫触
+ public const int uGetGatewayChannelIdFail = 15927;
+ /// <summary>
+ /// 鑾峰彇鍗忚皟鍣∕ac澶辫触
/// </summary>
- public const int uGetGatewayCoordinatorMacFail = 15928;
- /// <summary>
- /// 鑾峰彇鍗忚皟鍣≒anID澶辫触
+ public const int uGetGatewayCoordinatorMacFail = 15928;
+ /// <summary>
+ /// 鑾峰彇鍗忚皟鍣≒anID澶辫触
/// </summary>
- public const int uGetGatewayPanIDFail = 15929;
- /// <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>
+ /// 姝ｅ湪淇濆瓨鍗忚皟鍣╪v鍒嗗尯淇℃伅
+ /// </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 uUploadDataToDb = 15930;
- /// <summary>
- /// 浠庝簯绔笅杞芥暟鎹�
+ public const int uResponseTimeoutsAndBackupgatewayDataFail = 15942;
+ /// <summary>
+ /// 鍒涘缓澶囦唤鏂囦欢
+ /// </summary>
+ public const int uCreatBackupFile = 15943;
+ /// <summary>
+ /// 姝ｅ湪鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
+ /// </summary>
+ public const int uZbMsComSendOpening = 15944;
+ /// <summary>
+ /// 鑾峰彇缃戝叧鑷姩澶囦唤璁剧疆澶辫触
+ /// </summary>
+ public const int uGetGatewayAutoBackupStatuFail = 15945;
+ /// <summary>
+ /// 璁剧疆缃戝叧鑷姩澶囦唤澶辫触
+ /// </summary>
+ public const int uSetGatewayAutoBackupStatuFail = 15946;
+ /// <summary>
+ /// 姝ｅ湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
+ /// </summary>
+ public const int uBackupFileListGetting = 15947;
+ /// <summary>
+ /// 鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+ /// </summary>
+ public const int uGetBackupFileListFail = 15948;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,鑾峰彇澶囦唤鏂囦欢鍒楄〃澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndGetBackupFileListFail = 15949;
+ /// <summary>
+ /// 姝ｅ湪涓嬭浇澶囦唤鏂囦欢
+ /// </summary>
+ public const int uBackupFileDownloading = 15950;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,涓嬭浇澶囦唤鏂囦欢澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndDownloadBackupFileFail = 15951;
+ /// <summary>
+ /// 涓嬭浇澶囦唤鏂囦欢澶辫触
+ /// </summary>
+ public const int uDownloadBackupFileFail = 15952;
+ /// <summary>
+ /// 姝ｅ湪鎭㈠鍗忚皟鍣╪v鍒嗗尯
+ /// </summary>
+ public const int uGatewayNVRestoring = 15953;
+ /// <summary>
+ /// 鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+ /// </summary>
+ public const int uRestoreGatewayNVFail = 15954;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,鎭㈠鍗忚皟鍣╪v鍒嗗尯澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndRestoreGatewayNVFail = 15955;
+ /// <summary>
+ /// 姝ｅ湪閲嶅惎缃戝叧绯荤粺
+ /// </summary>
+ public const int uGatewayRerooting = 15956;
+ /// <summary>
+ /// 閲嶅惎缃戝叧绯荤粺澶辫触
+ /// </summary>
+ public const int uGatewayRerootFail = 15957;
+ /// <summary>
+ /// 鍝嶅簲瓒呮椂,閲嶅惎缃戝叧绯荤粺澶辫触
+ /// </summary>
+ public const int uResponseTimeoutsAndGatewayRerootFail = 15958;
+ /// <summary>
+ /// 缃戝叧鏁版嵁鎭㈠鎴愬姛!
+ /// </summary>
+ public const int uRestoreGatewayDataSuccess = 15959;
+ /// <summary>
+ /// 铏氭嫙椹卞姩璁惧
/// </summary>
- public const int uDwonloadDataFromDb = 15931;
- /// <summary>
- /// 涓婁紶鏁版嵁
+ public const int uVirtualDriveDevice = 15960;
+ /// <summary>
+ /// 瀵嗙爜寮�閿佹垚鍔�
/// </summary>
- public const int uUploadData = 15932;
- /// <summary>
- /// 涓婁紶鏁版嵁鎴愬姛
+ public const int uUnlockByPasswordSuccess = 15961;
+ /// <summary>
+ /// 瀵嗙爜寮�閿佸け璐�
/// </summary>
- public const int uUploadDataSuccess = 15933;
- /// <summary>
- /// 涓嬭浇鏁版嵁
+ public const int uUnlockByPasswordFail = 15962;
+ /// <summary>
+ /// 鎸囩汗寮�閿佹垚鍔�
/// </summary>
- public const int uDwonloadData = 15934;
- /// <summary>
- /// 涓嬭浇
+ public const int uUnlockByFingerPrintSuccess = 15963;
+ /// <summary>
+ /// 鎸囩汗寮�閿佸け璐�
/// </summary>
- public const int uDownLoad = 15935;
- /// <summary>
- /// 璁剧疆缃戝叧缁忕含搴﹀け璐�
+ public const int uUnlockByFingerPrintFail = 15964;
+ /// <summary>
+ /// IC鍗″紑閿佹垚鍔�
/// </summary>
- public const int uSetGatewaySiteFail = 15936;
- /// <summary>
- /// 姝ｅ湪淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅
+ public const int uUnlockByICcardSuccess = 15965;
+ /// <summary>
+ /// IC鍗″紑閿佸け璐�
/// </summary>
- public const int uGatewayNVFileSaving = 15937;
- /// <summary>
- /// 淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅澶辫触
+ public const int uUnlockByICcardFail = 15966;
+ /// <summary>
+ /// 寮�濮嬫椂闂村ぇ浜庣粨鏉熸椂闂�
+ /// </summary>
+ public const int uFromTimeIsOverToTime = 15967;
+ /// <summary>
+ /// 纭畾瑕佽В闄ょ粦瀹歿0}锛�
/// </summary>
- public const int uSaveGatewayNVFileFail = 15938;
- /// <summary>
- /// 鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳藉け璐�
+ public const int uComfirmUnBindedMsg = 15968;
+ /// <summary>
+ /// 鏇存柊绗笁鏂逛俊鎭け璐�
/// </summary>
- public const int uOpenZbMsComSendFail = 15939;
- /// <summary>
- /// 缃戝叧鏁版嵁澶囦唤澶辫触
+ public const int uUpdateOtherPartyInfoFail = 15969;
+ /// <summary>
+ /// 缁戝畾{0}鎴愬姛!
/// </summary>
- public const int uBackupgatewayDataFail = 15940;
- /// <summary>
- /// 寮�濮嬪浠界綉鍏虫暟鎹�
+ public const int uBindSomethingSuccess = 15970;
+ /// <summary>
+ /// 閿欒,绗笁鏂逛俊鎭涪澶�
/// </summary>
- public const int uStartBackupgatewayData = 15941;
+ public const int uErrorAndLostOtherPatyInfo = 15971;
+ /// <summary>
+ /// 鎮ㄥ綋鍓嶇殑IP鍙婄鍙ｅ湪浜戠涓嶅瓨鍦�,璇烽噸鏂扮櫥褰�!
+ /// </summary>
+ public const int uYouIpAndPortNoRecord = 15972;
+ /// <summary>
+ /// 娑堟伅涓績
+ /// </summary>
+ public const int uMessageCenter = 15973;
+ /// <summary>
+ /// 纭鍒犻櫎娑堟伅?
+ /// </summary>
+ public const int uDeleteMessageMsg = 15974;
/// <summary>
- /// 鍝嶅簲瓒呮椂,缃戝叧鏁版嵁澶囦唤澶辫触
+ /// 姝ｅ湪涓婁紶澶囦唤鏂囦欢
/// </summary>
- public const int uResponseTimeoutsAndBackupgatewayDataFail = 15942;
- /// <summary>
- /// 鍒涘缓澶囦唤鏂囦欢
+ public const int uBackupFileUploading = 15975;
+ /// <summary>
+ /// 纭鍒犻櫎鍏ㄩ儴娑堟伅?
+ /// </summary>
+ public const int uDeleteAllMessageMsg = 15976;
+ /// <summary>
+ /// 纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
+ /// </summary>
+ public const int uUnTipAllMessageMsg = 15977;
+ /// <summary>
+ /// 閫氫俊閾炬帴澶辫触
+ /// </summary>
+ public const int uCommunicationLinkFail = 15978;
+ /// <summary>
+ /// 鑾峰彇缃戠粶SSID澶辫触
+ /// </summary>
+ public const int uGetSsidFail = 15979;
+ /// <summary>
+ /// 瀵嗙爜鍙戦�佸け璐�
+ /// </summary>
+ public const int uSendPasswordFail = 15980;
+ /// <summary>
+ /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// </summary>
+ public const int uPleaseSelectGatewayXXNet = 15981;
+ /// <summary>
+ /// 璇疯繛鎺ュ搴璚iFi
+ /// </summary>
+ public const int uPleaseLinkHomeWifi = 15982;
+ /// <summary>
+ /// 姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
+ /// </summary>
+ public const int uShardContentGetting = 15983;
+
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
+ /// <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 BindGwToHome_BindGatewaysExists = 18004;
+ /// <summary>
+ /// 鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
+ /// </summary>
public const int BindSubAccount_NoExist = 18005;
/// <summary>
/// 璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
@@ -5234,4 +5412,4 @@
/// </summary>
public const int uDeviceBelongId12 = 40013;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0