From 0b5b6ec781a8cb3400ad34693792bad07e97a00c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 09:32:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/Common/R.cs | 86 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 68b7cc3..21c027a 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,55 @@
{
public static class StringId
{
+ /// <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>
+ /// 24灏忔椂缁熻鍥�
+ /// </summary>
+ public const int StatisticalChart24Hour = 533;
/// <summary>
/// 璁惧绂荤嚎涓紝鏆傛椂鏃犳硶鎿嶄綔
/// </summary>
@@ -1587,9 +1635,9 @@
/// </summary>
public const int modifyName = 5017;
/// <summary>
- /// 鍗曟洸鎾斁
+ /// 鍗曟洸寰幆鎾斁
/// </summary>
- public const int singleMode = 5018;
+ public const int singleCycleMode = 5018;
/// <summary>
/// 闅忔満鎾斁
/// </summary>
@@ -1706,6 +1754,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>
/// 姝ｅ父
@@ -2704,6 +2762,30 @@
/// 鍒拌揪
/// </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;
--
Gitblit v1.8.0