From ae142832f9721956f963cf008047a2620a035bf7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 27 十一月 2020 17:00:58 +0800
Subject: [PATCH] 2020-11-27-3

---
 HDL_ON/Common/R.cs |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index c80ad89..83e6dd2 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -446,17 +446,32 @@
         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;
-
+        public const int funLogic = 7028;
+        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;
+        public const int addtarget = 7036;
+        public const int monday = 7037;
+        public const int tuesday = 7038;
+        public const int wednesday = 7039;
+        public const int thursday = 7040;
+        public const int friday = 7041;
+        public const int saturday = 7042;
+        public const int sunday = 7043;
 
 
     }

--
Gitblit v1.8.0