From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 27 六月 2022 10:54:32 +0800
Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114
---
HDL_ON/Common/R.cs | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 213 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 2178858..cd21a50 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -6,6 +6,167 @@
{
/// <summary>
+ /// 鑾峰彇鏇村
+ /// </summary>
+ public const int GetMore = 543;
+ /// <summary>
+ /// 寰樺緤鎶ヨ
+ /// </summary>
+ public const int WanderingAlarm = 542;
+ /// <summary>
+ /// 鐩戞帶涓�
+ /// </summary>
+ public const int Monitoring = 541;
+ /// <summary>
+ /// 鎶ヨ涓�
+ /// </summary>
+ public const int InAlarming = 540;
+ /// <summary>
+ /// 鏅鸿兘闈㈡澘
+ /// </summary>
+ public const int SmartPanel = 539;
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ public const int Uint = 538;
+ /// <summary>
+ /// 婀垮害缁熻鍥�
+ /// </summary>
+ public const int HumidityStatistics = 537;
+
+ /// <summary>
+ /// 娓╁害缁熻鍥�
+ /// </summary>
+ public const int TemperatureStatistics = 536;
+ /// <summary>
+ /// 闇茬偣娓╁害
+ /// </summary>
+ public const int DewPointTemp = 535;
+ /// <summary>
+ /// 鏁版嵁
+ /// </summary>
+ public const int Data = 534;
+ /// <summary>
+ /// 璁垮浜岀淮鐮佺粨鏉熸椂闂�
+ /// </summary>
+ public const int VisitorEndTime = 2550;
+ /// <summary>
+ /// 璁垮浜岀淮鐮佸紑濮嬫椂闂�
+ /// </summary>
+ public const int VisitorStartTime = 2549;
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ public const int PhoneNumberErrorTip = 2548;
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ public const int PhoneNumber = 2547;
+ /// <summary>
+ /// 璁垮浜岀淮鐮�
+ /// </summary>
+ public const int VisitorQRCode = 2546;
+ /// <summary>
+ /// 鍙栨秷璁垮鍑瘉
+ /// </summary>
+ public const int CancleVisitorCredentials = 2545;
+ /// <summary>
+ /// 鐢熸垚璁垮鍑瘉
+ /// </summary>
+ public const int GenerateVisitorCredentials = 2544;
+ /// <summary>
+ /// 浜岀淮鐮佸凡澶辨晥
+ /// </summary>
+ public const int QRcodeIsInvalid = 2543;
+ /// <summary>
+ /// 闀挎寜浜岀淮鐮佸彲浠ュ皢浜岀淮鐮佷繚瀛樺埌鐩稿唽
+ /// </summary>
+ public const int LongPressQRCodeSave = 2542;
+ /// <summary>
+ /// 澶辨晥鏃堕棿
+ /// </summary>
+ public const int VisitorDelTipContent = 2541;
+ /// <summary>
+ /// 澶辨晥鏃堕棿
+ /// </summary>
+ public const int VisitorTipContent = 2540;
+ /// <summary>
+ /// 闅忔満鐢熸垚
+ /// </summary>
+ public const int RandomGeneration = 2539;
+ /// <summary>
+ /// 杈撳叆6浣嶅姩鎬佸瘑鐮�
+ /// </summary>
+ public const int Input6_DigitsTemporaryPassword = 2538;
+ /// <summary>
+ /// 杈撳叆璁垮鎵嬫満鍙风爜
+ /// </summary>
+ public const int InputPhoneNumberOfTheVisitor = 2537;
+ /// <summary>
+ /// 鎮ㄥ彂璧疯瀹㈠嚟璇佸悗锛岃鍑瘉灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜鎴栧瘑鐮佸紑閿佽繘琛岃繘鍑猴紝璇疯皑鎱庡垎浜鍑瘉
+ /// </summary>
+ public const int VisitorTip = 2536;
+ /// <summary>
+ /// 璁垮閭�璇疯褰�
+ /// </summary>
+ public const int VisitorInvitationRecord = 2532;
+ /// <summary>
+ /// 璁垮璁板綍
+ /// </summary>
+ public const int VisitorRecord = 2535;
+ /// <summary>
+ /// 璁垮閭�璇�
+ /// </summary>
+ public const int VisitorInvitation = 2534;
+ /// <summary>
+ /// 璁垮绠＄悊
+ /// </summary>
+ public const int VisitorManage = 2533;
+ /// <summary>
+ /// 24灏忔椂缁熻鍥�
+ /// </summary>
+ public const int StatisticalChart24Hour = 533;
+ /// <summary>
+ /// 璁惧绂荤嚎涓紝鏆傛椂鏃犳硶鎿嶄綔
+ /// </summary>
+ public const int DeviceOfflineCannotOption = 532;
+ /// <summary>
+ /// 浜斿垎閽熷唴鍏嶅瘑鐮佸紑閿�
+ /// </summary>
+ public const int DoorLock5minTip = 531;
+ /// <summary>
+ /// 涓洪槻姝㈠紑鍏抽棬鐨勮瑙︾偣鍑伙紝淇濊瘉瀹跺涵瀹夊叏锛岃杈撳叆鎮ㄧ殑闂ㄩ攣寮�闂ㄥ瘑鐮併��
+ /// </summary>
+ public const int DoorLockEntryPasswordTip = 530;
+ /// <summary>
+ /// 瀵嗙爜杈撳叆
+ /// </summary>
+ public const int EntryPassword = 529;
+ /// <summary>
+ /// 鍥轰欢鏇存柊
+ /// </summary>
+ public const int FirmwareUpdate = 528;
+ /// <summary>
+ /// 鏀寔HomeKit璇存槑
+ /// </summary>
+ public const int SupportHomeKitNotes = 527;
+ /// <summary>
+ /// 娉ㄩ攢璐﹀彿
+ /// </summary>
+ public const int CancelAccount = 526;
+ /// <summary>
+ /// 鍚敤
+ /// </summary>
+ public const int Enable = 525;
+ /// <summary>
+ /// 鍋滅敤
+ /// </summary>
+ public const int Bypass = 524;
+ /// <summary>
+ /// 瑙﹀彂鍚庡欢鏃舵姤璀�
+ /// </summary>
+ public const int DelayAlarm = 523;
+ /// <summary>
/// 鍒锋柊
/// </summary>
public const int Refresh = 522;
@@ -217,7 +378,7 @@
/// <summary>
/// 闃叉姢涓�
/// </summary>
- public const int UnderProtection=470;
+ public const int UnderProtection = 470;
/// <summary>
/// 鏈変汉杩涘叆
/// </summary>
@@ -261,7 +422,7 @@
/// <summary>
/// 瀹炴椂鑳借��
/// </summary>
- public const int RealTimeEnergyConsumption=459;
+ public const int RealTimeEnergyConsumption = 459;
/// <summary>
/// 鏃ユ湡
/// </summary>
@@ -461,7 +622,7 @@
public const int VerificationCodePrompt = 274;
public const int ChangeTheVerificationMethod = 273;
public const int ModifyBindingEmail = 272;
- public const int CurrentEmail =271;
+ public const int CurrentEmail = 271;
public const int Unbind = 270;
public const int ModifyBinding = 269;
public const int EmailAddress = 268;
@@ -483,14 +644,14 @@
public const int SavedSuccessfully = 252;
public const int AddFailedInsufficientPermissions = 251;
public const int OperationFailed = 250;
- public const int MemberAccountHasBeenAddedAndCannotBeAddedAgain =249;
+ public const int MemberAccountHasBeenAddedAndCannotBeAddedAgain = 249;
public const int ThisHomeDoesNotExistForTheUser = 248;
public const int FailedToAddUnableToAddYourself = 247;
public const int FailedToAddTheMemberAccountIsNotRegistered = 246;
public const int DataExceptionPleaseTryAgain = 245;
public const int MemberAddedSuccessfully = 244;
public const int AccountErrorPlsC = 243;
- public const int ConfirmInvitation =242;
+ public const int ConfirmInvitation = 242;
public const int ScanQRCoden = 241;
public const int NewMemberAccount = 240;
public const int AddMember = 239;
@@ -586,7 +747,7 @@
public const int AtStartup = 149;
public const int Unprotected = 148;
public const int VerificationCodeError = 147;
- public const int MultipleChoicesOfPagesYouNeedToProtect= 146;
+ public const int MultipleChoicesOfPagesYouNeedToProtect = 146;
public const int PleaseSelectThePageToBeUnlocked = 145;
public const int UesrName = 144;
public const int UesrNameCannotBeEmpty = 143;
@@ -638,7 +799,7 @@
public const int DefaultGallery = 97;
public const int DeleteRoom = 96;
public const int Save = 95;
- public const int FunctionManagement=94;
+ public const int FunctionManagement = 94;
public const int Floor = 93;
public const int RoomName = 92;
@@ -655,7 +816,7 @@
public const int DelFloorTip = 88;
public const int Tip = 87;
public const int Del = 86;
- public const int Scenes=85;
+ public const int Scenes = 85;
public const int AddFloorFailed_FloorAlreadyExist = 84;
public const int EditFloorName = 83;
public const int AddFloors = 82;
@@ -693,12 +854,12 @@
public const int BoundMobileInfo = 50;
public const int MyQRcode = 49;
public const int Name = 48;
- public const int PersonalCenter=47;
+ public const int PersonalCenter = 47;
public const int InvalidLoginCertificate = 46;
public const int AccountNotExist = 45;
public const int ConfirmReset = 44;
public const int RegistrationFailedPleaseTryAgain = 43;
- public const int NetworkAnomaly=42;
+ public const int NetworkAnomaly = 42;
public const int FailedToSendVerificationCode = 41;
public const int LoginFailed_AccountOrPasswordError = 40;
public const int Personal = 39;
@@ -719,7 +880,7 @@
public const int PlsEntryCorrectEmailAddress = 24;
public const int VerificationCodeWrong = 23;
public const int AccountAlreadyUse = 22;
- public const int PasswordIsUnqualified=21;
+ public const int PasswordIsUnqualified = 21;
public const int IncorrectRepeatPassword = 20;
public const int PlsEntryCorrectMobilNeumber = 19;
public const int PlsEntryVerificationCode = 18;
@@ -1547,9 +1708,9 @@
/// </summary>
public const int modifyName = 5017;
/// <summary>
- /// 鍗曟洸鎾斁
+ /// 鍗曟洸寰幆鎾斁
/// </summary>
- public const int singleMode = 5018;
+ public const int singleCycleMode = 5018;
/// <summary>
/// 闅忔満鎾斁
/// </summary>
@@ -1666,6 +1827,16 @@
/// 浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
/// </summary>
public const int qqMsuicTip = 5047;
+ /// <summary>
+ /// 寰簭寰幆
+ /// </summary>
+ public const int orderMode =5048;
+ /// <summary>
+ /// 鍗曟洸鎾斁
+ /// </summary>
+ public const int single =5049;
+
+
/// <summary>
/// 姝ｅ父
@@ -1730,7 +1901,7 @@
/// <summary>
/// 鍦ㄧ嚎
/// </summary>
- public const int zaixianhwb= 6015;
+ public const int zaixianhwb = 6015;
/// <summary>
/// 绂荤嚎
/// </summary>
@@ -1758,7 +1929,7 @@
/// <summary>
/// 涓嬩竴姝�
/// </summary>
- public const int xiayibu= 6022;
+ public const int xiayibu = 6022;
/// <summary>
/// 鐢垫簮
/// </summary>
@@ -1986,7 +2157,7 @@
/// <summary>
/// 閫夋嫨绾㈠鍝佺墝
/// </summary>
- public const int xuanzehongwaipinpai= 6081;
+ public const int xuanzehongwaipinpai = 6081;
/// <summary>
/// 鎽囧ご
/// </summary>
@@ -2263,11 +2434,11 @@
/// <summary>
/// 鏆傚仠
/// </summary>
- public const int stop= 7054;
+ public const int stop = 7054;
/// <summary>
/// 浜害
/// </summary>
- public const int brightnesLogic= 7055;
+ public const int brightnesLogic = 7055;
/// <summary>
/// 鐧惧垎姣�
/// </summary>
@@ -2279,7 +2450,7 @@
/// <summary>
/// 鍒跺喎
/// </summary>
- public const int coolLogic= 7058;
+ public const int coolLogic = 7058;
/// <summary>
/// 鍒剁儹
/// </summary>
@@ -2395,7 +2566,7 @@
/// <summary>
/// 瀹ゅ鍙樺寲
/// </summary>
- public const int shiwaibainhua=7087;
+ public const int shiwaibainhua = 7087;
/// <summary>
/// 閫夋嫨瀹ゅ鍙樺寲鏉′欢
/// </summary>
@@ -2439,11 +2610,11 @@
/// <summary>
/// 鏅村ぉ
/// </summary>
- public const int clearday =7098;
+ public const int clearday = 7098;
/// <summary>
/// 澶氫簯
/// </summary>
- public const int cloudy= 7099;
+ public const int cloudy = 7099;
/// <summary>
/// 涓嬮洦
/// </summary>
@@ -2467,7 +2638,7 @@
/// <summary>
/// 杞诲害姹℃煋:76~115ug/m鲁
/// </summary>
- public const int pmqingdu= 7105;
+ public const int pmqingdu = 7105;
/// <summary>
/// 涓害姹℃煋:116~150ug/m鲁
/// </summary>
@@ -2475,11 +2646,11 @@
/// <summary>
/// 閲嶅害姹℃煋:>150ug/m鲁
/// </summary>
- public const int pmzhongduwuran= 7107;
+ public const int pmzhongduwuran = 7107;
/// <summary>
/// 娉勬紡/鏃犳硠婕�
/// </summary>
- public const int xieluoandwuxieluo=7108;
+ public const int xieluoandwuxieluo = 7108;
/// <summary>
/// 娉勬紡
/// </summary>
@@ -2543,7 +2714,7 @@
/// <summary>
/// 浼�
/// </summary>
- public const int kongqiyou= 7124;
+ public const int kongqiyou = 7124;
/// <summary>
/// 鑹�
/// </summary>
@@ -2664,6 +2835,22 @@
/// 鍒拌揪
/// </summary>
public const int daoda = 7154;
+ /// <summary>
+ /// 姹傛晳/姝ｅ父
+ /// </summary>
+ public const int qiujiuandzhengchang = 7155;
+ /// <summary>
+ /// 姹傛晳
+ /// </summary>
+ public const int qiujiu = 7156;
+ /// <summary>
+ /// 鏄惁寮�閿佹椂
+ /// </summary>
+ public const int shifoukaisuoshi = 7157;
+ /// <summary>
+ /// 鏄�
+ /// </summary>
+ public const int shi = 7158;
--
Gitblit v1.8.0