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 |  108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 108 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index c2551df..bd61d6c 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,102 @@
     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>
+        /// 宸ヤ綔姝e父
+        /// </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;
@@ -2870,6 +2966,18 @@
         /// 鏈変汉鎶ヨ
         /// </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