From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/Common/R.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 7169226..30e9397 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,35 @@
{
public static class StringId
{
+
+ /// <summary>
+ /// 浜鸿劯褰曞叆澶辫触
+ /// </summary>
+ public const int FaceInputFailed = 507;
+ /// <summary>
+ /// 浜鸿劯褰曞叆鎴愬姛
+ /// </summary>
+ public const int FaceInputSucceeded = 506;
+ /// <summary>
+ /// 涓�绾у缓绛戞爣鍑�
+ /// </summary>
+ public const int Class_I_BuildingStandard = 505;
+ /// <summary>
+ /// 浜岀骇寤虹瓚鏍囧噯
+ /// </summary>
+ public const int SecondaryBuildingStandard = 504;
+ /// <summary>
+ /// 瓒呮爣
+ /// </summary>
+ public const int ExceedingTheStandard = 503;
+ /// <summary>
+ /// 鏄惁瑙ｉ櫎瀹夐槻璀︽姤锛�
+ /// </summary>
+ public const int ClearTheSecurityAlarmTip = 502;
+ /// <summary>
+ /// 瀹夐槻鎶ヨ
+ /// </summary>
+ public const int SecurityAlarmTipString = 501;
/// <summary>
/// 娣诲姞鍛婅鐩爣
/// </summary>
@@ -2541,7 +2570,24 @@
/// <summary>
/// 娣诲姞瀹夐槻
/// </summary>
- public const int addSecurityLogic = 7046;
+ public const int addSecurityLogic = 7146;
+ /// <summary>
+ /// 甯冮槻
+ /// </summary>
+ public const int bufang = 7147;
+ /// <summary>
+ /// 鎾ら槻
+ /// </summary>
+ public const int chefang = 7148;
+ /// <summary>
+ /// manual:鎵嬪姩
+ /// </summary>
+ public const int shoudong = 7149;
+ /// <summary>
+ /// smart锛氭櫤鑳�
+ /// </summary>
+ public const int zhineng = 7150;
+
#region LE鏂板
--
Gitblit v1.8.0