From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/R.cs | 251 +++++--------------------------------------------
1 files changed, 27 insertions(+), 224 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index ccf3348..00c144d 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -698,147 +698,6 @@
/// 346=鐭ラ亾浜�
/// </summary>
public const int Iknown = 346;
- /// <summary>
- /// 鏅捐。鏋�
- /// </summary>
- public const int Airer = 347;
- /// <summary>
- /// 鐜
- /// </summary>
- public const int Envoronment = 348;
- /// <summary>
- /// 钃濊壊鎸囩ず鐏揩閫熼棯鐑伮犅犅犅犅犅�
- /// </summary>
- public const int uSignalIcon349 = 349;
- /// <summary>
- /// 鍚屾椂闀挎寜锛寋0}鈥滀笂琛屸�濆拰鈥滀笅琛屸�濋敭5-10绉�
- /// </summary>
- public const int uSignalIcon350 = 350;
- /// <summary>
- /// 鏅捐。鏋朵笂鐢靛悗锛屽彂鍑鸿渹楦e0鏃讹紝{0}鍚屾椂鎸夆�滀笂琛屸�濆拰鈥滀笅琛屸�濋敭5-10绉�
- /// </summary>
- public const int uSignalIcon351 = 351;
- /// <summary>
- /// 缁胯壊鎸囩ず鐏揩閫熼棯鐑伮犅犅犅犅犅�
- /// </summary>
- public const int uSignalIcon352 = 352;
- /// <summary>
- /// 闀挎寜5绉抺0}(鎸夐敭)
- /// </summary>
- public const int uSignalIcon353 = 353;
- /// <summary>
- ///闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
- /// </summary>
- public const int uSignalIcon354 = 354;
-
- public const int AirerStop = 355;
- public const int AirerDown = 356;
- public const int AirerDry = 357;
- public const int AirerWind = 358;
- public const int AirerDisinfect = 359;
- public const int AirerLight = 360;
- public const int AirerUp = 361;
- public const int AddDoorLockCalmFingerprint = 362;
- public const int AddDoorLockFaceID = 363;
- public const int CalmFingerprintUnlock = 364;
- public const int FaceIDUnlock = 365;
- /// <summary>
- /// 璇锋瀵归棬閿佹憚鍍忓ご杩涜
- /// </summary>
- public static readonly int EntryFaceIDTip1 = 366;
- /// <summary>
- /// 浜鸿劯鎵弿褰曞叆寮�閿佹柟寮�
- /// </summary>
- public static readonly int EntryFaceIDTip2 = 367;
- /// <summary>
- /// 璇锋瀵归棬閿佹憚鍍忓ご杩涜鎵弿
- /// </summary>
- public static readonly int EntryFaceIDTip3 = 368;
- /// <summary>
- /// 褰曞叆寮�閿佹柟寮�
- /// </summary>
- public static readonly int EntryFaceIDTip4 = 369;
- /// <summary>
- /// 褰曞叆闈欒剦鎸囩汗
- /// </summary>
- public static readonly int EntryCalmFingerprint = 370;
- /// <summary>
- /// 褰曞叆浜鸿劯璇嗗埆鎴愬姛
- /// </summary>
- public static readonly int EntryFaceIDSuccess = 371;
- /// <summary>
- /// 褰曞叆闈欒剦鎸囩汗鎴愬姛
- /// </summary>
- public static readonly int EntryCalmFingerprintSuccess = 372;
- /// <summary>
- /// 浜鸿劯璇嗗埆
- /// </summary>
- public static readonly int FaceIDRemark = 373;
- /// <summary>
- /// 闈欒剦绾�
- /// </summary>
- public static readonly int CalmFingerprintRemark = 374;
- /// <summary>
- /// 浜鸿劯璇嗗埆
- /// </summary>
- public static readonly int FaceIDMark = 375;
- /// <summary>
- /// 闈欒剦绾�
- /// </summary>
- public static readonly int CalmFingerprintMark = 376;
- /// <summary>
- /// 1.闀挎寜{0}"鐓ф槑閿��5绉�
- /// </summary>
- public static readonly int uSignalIcon377 = 377;
- /// <summary>
- /// 2.鍐嶆寜{0}涓�涓�"涓婂崌閿��
- /// </summary>
- public static readonly int uSignalIcon378 = 378;
- /// <summary>
- /// 閬ユ帶鍣ㄦ甯哥殑鐘舵�佷笅锛岄暱鎸�"鐓ф槑閿��5绉掞紝{0}鍐嶆寜涓�涓嬧�濅笂鍗囬敭鈥滐紝铚傞福鍣ㄥ揩鍝�3澹帮紝钃濊壊閰嶇綉{0}鎸囩ず鐏揩闂紝杩涘叆閰嶇綉妯″紡銆�
- /// </summary>
- public static readonly int uSignalIcon379 = 379;
- /// <summary>
- /// 鐑樺共鏃堕棿
- /// </summary>
- public static readonly int AirerDryTime = 380;
- /// <summary>
- /// 椋庡共鏃堕棿
- /// </summary>
- public static readonly int AirerWindTime = 381;
- /// <summary>
- /// 娑堟瘨鏃堕棿
- /// </summary>
- public static readonly int AirerDisinfectTime = 382;
- /// <summary>
- /// 榛樿
- /// </summary>
- public static readonly int AirerDefault = 383;
- /// <summary>
- /// 灏忔椂
- /// </summary>
- public static readonly int AirerHour = 384;
- /// <summary>
- /// 鍒嗛挓
- /// </summary>
- public static readonly int AirerMin = 385;
- /// <summary>
- /// 鏅捐。
- /// </summary>
- public const int AirerFun = 386;
- /// <summary>
- /// 璁剧疆鏅捐。鏋剁儤骞叉椂闂村け璐�
- /// </summary>
- public const int AirerDryTimeFailed = 387;
- /// <summary>
- ///璁剧疆鏅捐。鏋堕骞叉椂闂村け璐�
- /// </summary>
- public const int AirerWindTimeFailed = 388;
- /// <summary>
- /// 璁剧疆鏅捐。鏋舵秷姣掓椂闂村け璐�
- /// </summary>
- public const int AirerDisinfectTimeFailed = 389;
-
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -4274,7 +4133,7 @@
/// </summary>
public const int uUpLoadShardDataFail = 15561;
/// <summary>
- /// 鍏朵粬闃插尯閲屾病鏈夐厤缃紶鎰熷櫒璁惧
+ /// 鍐呴儴銆佸懆鐣屻�佸嚭鍏ラ槻鍖洪噷閮芥病鏈夐厤缃湁浼犳劅鍣ㄨ澶�
/// </summary>
public const int uNotSensorInOtherSectors = 15562;
/// <summary>
@@ -6638,97 +6497,49 @@
/// </summary>
public const int uPleaseSelectGatewayToBeReplaced = 16170;
/// <summary>
+ /// 鐧婚檰Token宸茬粡杩囨湡,璇烽噸鏂扮櫥闄�
+ /// </summary>
+ public const int uLoginTokenIsTimeOutPleaseLoginAgain = 16171;
+ /// <summary>
+ /// 閲嶇疆瀵嗙爜澶辫触
+ /// </summary>
+ public const int uReSetPasswordFail = 16172;
+ /// <summary>
+ /// 淇敼瀵嗙爜澶辫触
+ /// </summary>
+ public const int uEditorPasswordFail = 16173;
+ /// <summary>
+ /// 缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�
+ /// </summary>
+ public const int uBindGatewayFailPleaseUploadAgain = 16174;
+ /// <summary>
+ /// 缁戝畾缃戝叧澶辫触,璇烽噸鏂版搷浣�
+ /// </summary>
+ public const int uBindGatewayFailPleaseDoAgain = 16175;
+ /// <summary>
/// 浜鸿劯璇嗗埆
/// </summary>
- public const int uFaceRecognition = 16171;
+ public const int uFaceRecognition = 16176;
/// <summary>
/// 闈欒剦绾�
/// </summary>
- public const int uStriaVenosus = 16172;
+ public const int uStriaVenosus = 16177;
/// <summary>
/// 闈欒剦绾瑰紑閿佹垚鍔�
/// </summary>
- public const int uStriaVenosusUnLockSuccess = 16173;
+ public const int uStriaVenosusUnLockSuccess = 16178;
/// <summary>
/// 闈欒剦绾瑰紑閿佸け璐�
/// </summary>
- public const int uStriaVenosusUnLockFail = 16174;
+ public const int uStriaVenosusUnLockFail = 16179;
/// <summary>
/// 浜鸿劯璇嗗埆寮�閿佹垚鍔�
/// </summary>
- public const int uFaceRecognitionUnLockSuccess = 16175;
+ public const int uFaceRecognitionUnLockSuccess = 16180;
/// <summary>
/// 浜鸿劯璇嗗埆寮�閿佸け璐�
/// </summary>
- public const int uFaceRecognitionUnLockFail = 16176;
- /// <summary>
- /// 纭鏇挎崲鎺夌綉鍏�:{0}?
- /// </summary>
- public const int uReplaceGatewayConfirmMsg = 16177;
- /// <summary>
- /// 姝e湪鑾峰彇閰嶇疆鏁版嵁
- /// </summary>
- public const int uGettingConfigurationData = 16178;
- /// <summary>
- /// 鐩爣缃戝叧妫�娴嬩笉鍒板浠芥暟鎹�,鏃犳硶鎵ц鏇挎崲鎿嶄綔
- /// </summary>
- public const int uTaegetGatewayNotHadBackupAndDoNotReplace = 16179;
- /// <summary>
- /// 姝e湪鍙樻洿鏈湴閰嶇疆
- /// </summary>
- public const int uChangingLocalConfiguration = 16180;
- /// <summary>
- /// 鏇挎崲缃戝叧鎴愬姛
- /// </summary>
- public const int uReplacegatewaySuccess = 16181;
- /// <summary>
- /// 閫夋嫨浣跨敤鐨勫浠�
- /// </summary>
- public const int uSelectUseBackup = 16182;
- /// <summary>
- /// 鏄惁浣跨敤澶囦唤:{0}?
- /// </summary>
- public const int uSelectUseBackupConfirmMsg = 16183;
- /// <summary>
- /// 鏈�楂樺
- /// </summary>
- public const int uTheHighestPoint = 16184;
- /// <summary>
- /// 鏈�浣庡
- /// </summary>
- public const int uTheLowestPoint = 16185;
- /// <summary>
- /// 鎵撳紑鐑樺共
- /// </summary>
- public const int uOpenDry = 16186;
- /// <summary>
- /// 鍏抽棴鐑樺共
- /// </summary>
- public const int uCloseDry = 16187;
- /// <summary>
- /// 鎵撳紑娑堟瘨
- /// </summary>
- public const int uOpenDisinfect = 16188;
- /// <summary>
- /// 鍏抽棴娑堟瘨
- /// </summary>
- public const int uCloseDisinfect = 16189;
- /// <summary>
- /// 鎵撳紑鐓ф槑
- /// </summary>
- public const int uOpenLighting = 16190;
- /// <summary>
- /// 鍏抽棴鐓ф槑
- /// </summary>
- public const int uCloseLighting = 16191;
- /// <summary>
- /// 鎵撳紑椋庡共
- /// </summary>
- public const int uOpenAirdry = 16192;
- /// <summary>
- /// 鍏抽棴椋庡共
- /// </summary>
- public const int uCloseAirdry = 16193;
+ public const int uFaceRecognitionUnLockFail = 16181;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -7122,14 +6933,6 @@
/// 鐞冨瀷绉诲姩浼犳劅鍣�
/// </summary>
public const int uDeviceDirectionName30 = 70029;
- /// <summary>
- /// 鏅捐。鏋�
- /// </summary>
- public const int uDeviceDirectionName31 = 70030;
- /// <summary>
- /// 绌烘皵璐ㄩ噺浼犳劅鍣�
- /// </summary>
- public const int uDeviceDirectionName32 = 70031;
}
}
--
Gitblit v1.8.0