From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7

---
 HDL_ON/Common/R.cs |   97 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 97 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index d7fe0f2..3160dc2 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,95 @@
 {
     public static class StringId
     {
+
+        /// <summary>
+        /// 瀹夐槻鎶ヨ
+        /// </summary>
+        public const int SecurityAlarmTipString = 501;
+        /// <summary>
+        /// 娣诲姞鍛婅鐩爣
+        /// </summary>
+        public const int AddAlarmTarget = 500;
+        /// <summary>
+        /// 娣诲姞甯冮槻鍔熻兘
+        /// </summary>
+        public const int AddDefenseFunction = 499;
+        /// <summary>
+        /// 瑙﹀彂寤舵椂
+        /// </summary>
+        public const int TriggerDelay = 498;
+        /// <summary>
+        /// 鑷畾涔�
+        /// </summary>
+        public const int Custom = 497;
+        /// <summary>
+        /// 杩樻病鏈夊叧鑱斾换鍔″竷闃茬姸鎬�
+        /// </summary>
+        public const int ThereIsNoAssociatedTaskDeploymentStatus = 496;
+        /// <summary>
+        /// 浜鸿劯閫氳璁剧疆
+        /// </summary>
+        public const int FacePassageSetting = 495;
+        /// <summary>
+        /// 璁剧疆闈㈠
+        /// </summary>
+        public const int SetFace = 494;
+        /// <summary>
+        /// 閲嶇疆闈㈠
+        /// </summary>
+        public const int ResetFace = 493;
+        /// <summary>
+        /// 鎶归櫎鏁版嵁
+        /// </summary>
+        public const int EraseData = 492;
+        /// <summary>
+        /// 鍏充簬闈㈠ID涓庨殣绉�
+        /// </summary>
+        public const int AboutFaceIdAndPrivacy = 491;
+        /// <summary>
+        /// 绀惧尯闂ㄧ閫氳
+        /// </summary>
+        public const int CommunityAccessControl = 490;
+        /// <summary>
+        /// 灏嗛潰瀹笽D搴旂敤浜庯細
+        /// </summary>
+        public const int ApplyFaceIdTo = 489;
+        /// <summary>
+        /// 浜鸿劯閫氳
+        /// </summary>
+        public const int FacePassage = 488;
+        /// <summary>
+        /// 瑙﹀彂鍚庡憡璀︾洰鏍�
+        /// </summary>
+        public const int AlarmTargetAfterTriggering = 487;
+        /// <summary>
+        /// 甯冮槻鍔熻兘/鎶ヨ鐘舵��
+        /// </summary>
+        public const int DefenseFunctionArmState = 486;
+        /// <summary>
+        /// 鏌ョ湅/淇敼
+        /// </summary>
+        public const int CheckModify = 485;
+        /// <summary>
+        /// 寮�鍚�
+        /// </summary>
+        public const int OpenArm = 484;
+        /// <summary>
+        /// 璇疯緭鍏ifi-mac鐮�
+        /// </summary>
+        public const int PlsEntryMacCode = 483;
+        /// <summary>
+        /// 鐕冩皵浼犳劅鍣�
+        /// </summary>
+        public const int SensorGas = 482;
+        /// <summary>
+        /// 鍙互寮�濮嬩娇鐢ㄧ幆澧冧紶鎰熷櫒浜�
+        /// </summary>
+        public const int CanStartUsingEnvironmentalSensor = 481;
+        /// <summary>
+        /// 鐜浼犳劅鍣�
+        /// </summary>
+        public const int SensorEnvironment = 480;
         /// <summary>
         /// 椋庨噺
         /// </summary>
@@ -2450,6 +2539,14 @@
         /// 浼樼
         /// </summary>
         public const int youxiu = 7144;
+        /// <summary>
+        /// 瀹夐槻
+        /// </summary>
+        public const int anfang = 7145;
+        /// <summary>
+        /// 娣诲姞瀹夐槻
+        /// </summary>
+        public const int addSecurityLogic = 7046;
 
 
         #region LE鏂板

--
Gitblit v1.8.0