From 46719b11d11b6544b57cf966cf498fbedf9b613e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:02:49 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr1215

---
 HDL_ON/Common/R.cs |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 4d9b039..4afa676 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,8 +4,55 @@
 {
     public static class StringId
     {
+        /// <summary>
+        /// 璁垮绠$悊
+        /// </summary>
+        public const int VisitorManage = 533;
+        /// <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>
+        /// 24灏忔椂缁熻鍥�
+        /// </summary>
+        public const int StatisticalChart24Hour = 533;
         /// <summary>
         /// 璁惧绂荤嚎涓紝鏆傛椂鏃犳硶鎿嶄綔
         /// </summary>
@@ -2705,7 +2752,14 @@
         /// 鍒拌揪
         /// </summary>
         public const int daoda = 7154;
-
+        /// <summary>
+        /// 姹傛晳/姝e父
+        /// </summary>
+        public const int qiujiuandzhengchang = 7155;
+        /// <summary>
+        /// 姹傛晳
+        /// </summary>
+        public const int qiujiu = 7156;
 
 
         #region LE鏂板

--
Gitblit v1.8.0