From 6ba43603ccd8868a4ee73e9b978b7cb20a5b2c52 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 14:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e02ec28..d7c9a07 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -479,6 +479,12 @@
         public const int delAutomation = 7049;
         public const int addSceneLogic = 7050;
         public const int delayLogic = 7051;
+        public const int saveFail = 7052;
+        public const int delFail = 7053;
+        public const int stop= 7054;
+        public const int brightnesLogic= 7055;
+        public const int percentum = 7056;
+        
 
 
         #region LE鏂板
@@ -638,6 +644,34 @@
         /// 甯歌闂
         /// </summary>
         public const int CommonQuestion = 9038;
+        /// <summary>
+        /// 鍒嗕韩涓庡姛鑳�
+        /// </summary>
+        public const int SharingAndFunctionality = 9039;
+        /// <summary>
+        /// 鎶ヨ绫�
+        /// </summary>
+        public const int AlarmType = 9040;
+        /// <summary>
+        /// 绯荤粺淇℃伅
+        /// </summary>
+        public const int SystemMessage = 9041;
+        /// <summary>
+        /// 淇℃伅涓績
+        /// </summary>
+        public const int MessageCenter = 9042;
+        /// <summary>
+        /// 璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰曘��
+        /// </summary>
+        public const int LoggedOnOtherDevices = 9043;
+        /// <summary>
+        /// 涓婁紶鎴愬姛
+        /// </summary>
+        public const int UploadSuccessfully = 9044;
+        /// <summary>
+        /// 涓婁紶澶辫触
+        /// </summary>
+        public const int UploadFailed = 9045;
 
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅

--
Gitblit v1.8.0