From 1761bbd82d7c1251283e3baa9b519204e456b2f8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 25 十一月 2020 16:50:55 +0800
Subject: [PATCH] 2020-11-25-1

---
 HDL_ON/Common/R.cs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index c625600..6734ee8 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -446,13 +446,13 @@
         public const int selectionCondition = 7015;
         public const int time = 7016;
         public const int selectionTimeCondition = 7017;
-        public const int hour =7018;
+        public const int hour = 7018;
         public const int timeHorizon = 7019;
         public const int h = 7020;
         public const int m = 7021;
-        public const int s= 7022;
-        public const int cancelSelected= 7023;
-        public const int confirmSelected= 7024;
+        public const int s = 7022;
+        public const int cancelSelected = 7023;
+        public const int confirmSelected = 7024;
         public const int timeTipText = 7025;
         public const int startTime = 7026;
         public const int endTime = 7027;
@@ -460,6 +460,10 @@
         public const int selectedFunCondition = 7029;
         public const int allAreas = 7030;
         public const int allFun = 7031;
+        public const int onLogic = 7032;
+        public const int offLogic = 7033;
+        public const int switchLogic = 7034;
+        public const int completeLogic= 7035;
 
 
 

--
Gitblit v1.8.0