From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index a809493..aaf50ae 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,12 +5,39 @@
     public static class StringId
     {
 
+
+
+
+
+
+
+        /// <summary>
+        /// 娉細鐢ㄦ埛绠$悊浠呭彲瀵瑰凡娣诲姞鐢ㄦ埛杩涜绠$悊銆傚闇�娣诲姞鏂扮敤鎴凤紝璇峰墠寰�閿佺杩涜鐩稿叧鎿嶄綔銆�
+        /// </summary>
+        public const int VideoDoorlockManagerTip = 685;
+        /// <summary>
+        /// 闀垮害瓒呭嚭鑼冨洿
+        /// </summary>
+        public const int LengthOutOfRange = 684;
+        /// <summary>
+        /// 璇ユ椂闂存棤鏁�
+        /// </summary>
+        public const int TimeInvalid = 683;
+        //public const int 
+        /// <summary>
+        /// 缇ょ粍锛堣窇椹伅鍒嗙粍锛�
+        /// </summary>
+        public const int HorseRaceLampGroup = 682;
+        /// <summary>
+        /// 鑷姩鐐僵娴嬭瘯
+        /// </summary>
+        public const int CulorfulTest = 681;
         /// <summary>
         /// 鐐僵寮�鍏�
         /// </summary>
         public const int ColorfulSwitch = 680;
         /// <summary>
-        /// 缇ゆ帶
+        /// 缁勬帶
         /// </summary>
         public const int GroupControl = 679;
         /// <summary>
@@ -3459,7 +3486,8 @@
         /// RGB鑹茬洏
         /// </summary>
         public const int rgbsepan = 7172;
-        
+       
+
 
 
         /// <summary>

--
Gitblit v1.8.0