From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL_ON/Common/R.cs | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 259 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index aab607c..73dc6b3 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,214 @@
{
public static class StringId
{
-
+ /// <summary>
+ /// 鍒犻櫎浜鸿劯鏁版嵁
+ /// </summary>
+ public const int DeleteMemberFace = 595;
+ /// <summary>
+ /// 璇疯緭鍏ユ垚鍛樺娉�
+ /// </summary>
+ public const int PlsEntrySubAccountRemark = 594;
+ /// <summary>
+ /// 浜鸿劯鐓х墖
+ /// </summary>
+ public const int MemberFace = 593;
+ /// <summary>
+ /// 鎴愬憳璐﹀彿
+ /// </summary>
+ public const int MemberAccount = 592;
+ /// <summary>
+ /// 鎴愬憳鍚嶇О
+ /// </summary>
+ public const int MemberName = 591;
+ /// <summary>
+ /// 浣忓畢浜や粯
+ /// </summary>
+ public const int ResidentialDelivery = 590;
+ /// <summary>
+ /// 涓嶅悓鎰�
+ /// </summary>
+ public const int Disagree = 589;
+ /// <summary>
+ /// 浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+ /// </summary>
+ public const int FaceProtocolPrompt = 588;
+ /// <summary>
+ /// 浜鸿劯绠＄悊
+ /// </summary>
+ public const int FaceManagemant = 587;
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public const int Sort = 586;
+ /// <summary>
+ /// 鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
+ /// </summary>
+ public const int Get3tyIotInfoFailed = 585;
+ /// <summary>
+ /// 甯冮槻鐘舵��
+ /// </summary>
+ public const int DeploymentStatus = 584;
+ /// <summary>
+ /// 钀ょ煶鎽勫儚澶�
+ /// </summary>
+ public const int EZVIZ = 583;
+ /// <summary>
+ /// 纭畾鍒犻櫎璇ヨ澶囧悧?
+ /// </summary>
+ public const int AreYouSureToDeleteThisDevice = 582;
+ /// <summary>
+ ///
+ /// </summary>
+ public const int EmptyString = 581;
+ /// <summary>
+ /// 鏄惁纭畾鍒犻櫎缁勫悎璋冨厜
+ /// </summary>
+ public const int DoYouWantDelCombinedDimming = 580;
+ /// <summary>
+ /// 娉ㄩ攢
+ /// </summary>
+ public const int Cancellation = 579;
+ /// <summary>
+ /// 鏈烘鑷�
+ /// </summary>
+ public const int MechanicalArm = 578;
+ /// <summary>
+ /// 闃�闂ㄥ凡鎵撳紑
+ /// </summary>
+ public const int ValveOpened = 577;
+ /// <summary>
+ /// 闃�闂ㄥ凡鍏抽棴
+ /// </summary>
+ public const int ValveClosed = 576;
+ /// <summary>
+ /// 閫夋嫨妯″紡
+ /// </summary>
+ public const int SelectMode = 575;
+ /// <summary>
+ /// 鍒剁儹闄ゆ箍
+ /// </summary>
+ public const int HeatingAndDehumidification = 574;
+ /// <summary>
+ /// 鍦ㄥ
+ /// </summary>
+ public const int AtHome = 573;
+ /// <summary>
+ /// 绂诲
+ /// </summary>
+ public const int AwayHome = 572;
+ /// <summary>
+ /// 鐫＄湢
+ /// </summary>
+ public const int Sleep = 571;
+ /// <summary>
+ /// 瀹ゅ:27掳/瀹ゅ唴:27掳
+ /// </summary>
+ public const int IndoorTempOutdoorTemp = 570;
+ /// <summary>
+ /// 绉戞妧
+ /// </summary>
+ public const int Acst = 569;
+ /// <summary>
+ /// 杩愯鏁伴噺/鎬绘暟閲�: --/--
+ /// </summary>
+ public const int OperationDataTotalData = 568;
+ /// <summary>
+ /// 鐢垫睜SOC
+ /// </summary>
+ public const int BatterySOC = 567;
+ /// <summary>
+ /// 褰撳墠鍙戠數鍔熺巼
+ /// </summary>
+ public const int CurrentPowerGeneration = 566;
+ /// <summary>
+ /// 浠婃棩鐢甸噺
+ /// </summary>
+ public const int PowerTenerationToday = 565;
+ /// <summary>
+ /// 宸ヤ綔妯″紡
+ /// </summary>
+ public const int WorkingMode = 564;
+ /// <summary>
+ /// 宸ヤ綔姝ｅ父
+ /// </summary>
+ public const int NormalOperation = 563;
+ /// <summary>
+ /// 鍏変紡鍌ㄨ兘
+ /// </summary>
+ public const int PhotovoltaicEnergyStorage = 562;
+ /// <summary>
+ /// 鍘熷瘑鐮�
+ /// </summary>
+ public const int OriginalPassword = 561;
+ /// <summary>
+ /// 宸茬粦瀹�
+ /// </summary>
+ public const int Bound = 560;
+ /// <summary>
+ /// 缁戝畾绗笁鏂硅处鍙�
+ /// </summary>
+ public const int Bind3thIotAccount = 559;
+ /// <summary>
+ /// 鏈変汉鍧愮潃
+ /// </summary>
+ public const int SomeoneSitting = 558;
+ /// <summary>
+ /// 鏈変汉绔欑潃
+ /// </summary>
+ public const int SomeoneStanding = 557;
+ /// <summary>
+ /// 鏈変汉鍦ㄨ窇
+ /// </summary>
+ public const int SomeoneRunning = 556;
+ /// <summary>
+ /// 閫�鍑哄疄楠屽妯″紡
+ /// </summary>
+ public const int ExitLabModel = 555;
+ /// <summary>
+ /// 姣背娉㈠疄楠屽妯″紡鎻愮ず鏂囨湰
+ /// </summary>
+ public const int LabTipText = 554;
+ /// <summary>
+ /// 鍦版殩闃�闂�
+ /// </summary>
+ public const int FloorHeatingValve = 553;
+ /// <summary>
+ /// 姣涚粏闃�闂�
+ /// </summary>
+ public const int CapillaryValve = 552;
+ /// <summary>
+ /// 婀垮害鏍″噯
+ /// </summary>
+ public const int HumidityCalibration = 551;
+ /// <summary>
+ /// 娓╁害鏍″噯
+ /// </summary>
+ public const int TemperatureCalibration = 550;
+ /// <summary>
+ /// 琛ㄩ潰娓╁害
+ /// </summary>
+ public const int SurfaceTemperature = 549;
+ /// <summary>
+ /// 瀹ゅ唴
+ /// </summary>
+ public const int Indoor = 548;
+ /// <summary>
+ /// 鎶ヨ鍔熻兘
+ /// </summary>
+ public const int AlarmFunction = 547;
+ /// <summary>
+ /// 瀹為獙瀹ゆā寮�
+ /// </summary>
+ public const int LaboratoryMode = 546;
+ /// <summary>
+ /// 鎶ヨ鏁版嵁缁熻
+ /// </summary>
+ public const int AlarmDataStatistics = 545;
+ /// <summary>
+ /// 瑙掑害
+ /// </summary>
+ public const int Angle = 544;
/// <summary>
/// 鑾峰彇鏇村
/// </summary>
@@ -50,6 +257,10 @@
/// 璁垮浜岀淮鐮佺粨鏉熸椂闂�
/// </summary>
public const int VisitorEndTime = 2550;
+ /// <summary>
+ /// 鍔ㄦ�佸瘑鐮佸凡澶辨晥
+ /// </summary>
+ public const int TemporaryPasswordInvalid = 2551;
/// <summary>
/// 璁垮浜岀淮鐮佸紑濮嬫椂闂�
/// </summary>
@@ -107,6 +318,10 @@
/// </summary>
public const int VisitorTip = 2536;
/// <summary>
+ /// 璁垮閭�璇疯褰�
+ /// </summary>
+ public const int VisitorInvitationRecord = 2532;
+ /// <summary>
/// 璁垮璁板綍
/// </summary>
public const int VisitorRecord = 2535;
@@ -116,6 +331,9 @@
public const int VisitorInvitation = 2534;
/// <summary>
/// 璁垮绠＄悊
+ /// </summary>
+ public const int VisitorManage = 2533;
+ /// <summary>
/// 24灏忔椂缁熻鍥�
/// </summary>
public const int StatisticalChart24Hour = 533;
@@ -2844,6 +3062,46 @@
/// 鏄�
/// </summary>
public const int shi = 7158;
+ /// <summary>
+ /// 璺屽�掓姤璀�
+ /// </summary>
+ public const int diedaobaojing = 7159;
+ /// <summary>
+ /// 鏈変汉鎶ヨ
+ /// </summary>
+ public const int yourenbaojing = 7160;
+ /// <summary>
+ /// 鎻愮ず闊�
+ /// </summary>
+ public const int tishiyin = 7161;
+ /// <summary>
+ /// 浜鸿劯寮�闂�
+ /// </summary>
+ public const int renliankaimen = 7162;
+ /// <summary>
+ /// 瑙嗛閫氳瘽鍛煎彨
+ /// </summary>
+ public const int shipintonghuahujiao = 7163;
+ /// <summary>
+ /// 鏈烘鎵�
+ /// </summary>
+ public const int jixieshou = 7164;
+ /// <summary>
+ /// 鍖哄煙鍏ヤ镜鍛婅
+ /// </summary>
+ public const int quyuruqingaojing = 7165;
+ /// <summary>
+ /// 鎽勫儚澶�
+ /// </summary>
+ public const int shexiangtou = 7166;
+ /// <summary>
+ /// 鎬绘帶寮�鍏�
+ /// </summary>
+ public const int zongkogkaiguan = 7167;
+ /// <summary>
+ /// PM210
+ /// </summary>
+ public const int pm10= 7168;
--
Gitblit v1.8.0