From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/Common/R.cs | 243 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 223 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 0afff81..bd61d6c 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,77 +5,234 @@
public static class StringId
{
/// <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>
+ 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 = 550;
+ public const int VisitorEndTime = 2550;
+ /// <summary>
+ /// 鍔ㄦ�佸瘑鐮佸凡澶辨晥
+ /// </summary>
+ public const int TemporaryPasswordInvalid = 2551;
/// <summary>
/// 璁垮浜岀淮鐮佸紑濮嬫椂闂�
/// </summary>
- public const int VisitorStartTime = 549;
+ public const int VisitorStartTime = 2549;
/// <summary>
/// 鎵嬫満鍙�
/// </summary>
- public const int PhoneNumberErrorTip = 548;
+ public const int PhoneNumberErrorTip = 2548;
/// <summary>
/// 鎵嬫満鍙�
/// </summary>
- public const int PhoneNumber = 547;
+ public const int PhoneNumber = 2547;
/// <summary>
/// 璁垮浜岀淮鐮�
/// </summary>
- public const int VisitorQRCode = 546;
+ public const int VisitorQRCode = 2546;
/// <summary>
/// 鍙栨秷璁垮鍑瘉
/// </summary>
- public const int CancleVisitorCredentials = 545;
+ public const int CancleVisitorCredentials = 2545;
/// <summary>
/// 鐢熸垚璁垮鍑瘉
/// </summary>
- public const int GenerateVisitorCredentials = 544;
+ public const int GenerateVisitorCredentials = 2544;
/// <summary>
/// 浜岀淮鐮佸凡澶辨晥
/// </summary>
- public const int QRcodeIsInvalid = 543;
+ public const int QRcodeIsInvalid = 2543;
/// <summary>
/// 闀挎寜浜岀淮鐮佸彲浠ュ皢浜岀淮鐮佷繚瀛樺埌鐩稿唽
/// </summary>
- public const int LongPressQRCodeSave = 542;
+ public const int LongPressQRCodeSave = 2542;
/// <summary>
/// 澶辨晥鏃堕棿
/// </summary>
- public const int VisitorDelTipContent = 541;
+ public const int VisitorDelTipContent = 2541;
/// <summary>
/// 澶辨晥鏃堕棿
/// </summary>
- public const int VisitorTipContent = 540;
+ public const int VisitorTipContent = 2540;
/// <summary>
/// 闅忔満鐢熸垚
/// </summary>
- public const int RandomGeneration = 539;
+ public const int RandomGeneration = 2539;
/// <summary>
/// 杈撳叆6浣嶅姩鎬佸瘑鐮�
/// </summary>
- public const int Input6_DigitsTemporaryPassword = 538;
+ public const int Input6_DigitsTemporaryPassword = 2538;
/// <summary>
/// 杈撳叆璁垮鎵嬫満鍙风爜
/// </summary>
- public const int InputPhoneNumberOfTheVisitor = 537;
+ public const int InputPhoneNumberOfTheVisitor = 2537;
/// <summary>
/// 鎮ㄥ彂璧疯瀹㈠嚟璇佸悗锛岃鍑瘉灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜鎴栧瘑鐮佸紑閿佽繘琛岃繘鍑猴紝璇疯皑鎱庡垎浜鍑瘉
/// </summary>
- public const int VisitorTip = 536;
+ public const int VisitorTip = 2536;
+ /// <summary>
+ /// 璁垮閭�璇疯褰�
+ /// </summary>
+ public const int VisitorInvitationRecord = 2532;
/// <summary>
/// 璁垮璁板綍
/// </summary>
- public const int VisitorRecord = 535;
+ public const int VisitorRecord = 2535;
/// <summary>
/// 璁垮閭�璇�
/// </summary>
- public const int VisitorInvitation = 534;
+ public const int VisitorInvitation = 2534;
/// <summary>
/// 璁垮绠＄悊
/// </summary>
- public const int VisitorManage = 533;
+ public const int VisitorManage = 2533;
+ /// <summary>
+ /// 24灏忔椂缁熻鍥�
+ /// </summary>
+ public const int StatisticalChart24Hour = 533;
/// <summary>
/// 璁惧绂荤嚎涓紝鏆傛椂鏃犳硶鎿嶄綔
/// </summary>
@@ -1658,9 +1815,9 @@
/// </summary>
public const int modifyName = 5017;
/// <summary>
- /// 鍗曟洸鎾斁
+ /// 鍗曟洸寰幆鎾斁
/// </summary>
- public const int singleMode = 5018;
+ public const int singleCycleMode = 5018;
/// <summary>
/// 闅忔満鎾斁
/// </summary>
@@ -1777,6 +1934,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>
/// 姝ｅ父
@@ -2775,6 +2942,42 @@
/// 鍒拌揪
/// </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;
+ /// <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;
--
Gitblit v1.8.0