From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/Common/R.cs | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index c80ad89..8502784 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -431,8 +431,8 @@
public const int newAutomation = 7000;
public const int editAutomation = 7001;
public const int ifCondition = 7002;
- public const int whenTheFollowingConditionsAreMet = 7003;
- public const int ifOneOfTheseConditionsIsMet = 7004;
+ public const int andCondition = 7003;
+ public const int orCondition = 7004;
public const int isExecuted = 7005;
public const int theFollowingActions = 7006;
public const int cyclic = 7007;
@@ -446,18 +446,39 @@
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;
+ public const int meetTheCondition = 7044;
+ public const int setlogic = 7045;
+ public const int namelogic = 7046;
+ public const int editName = 7047;
+ public const int NameAlreadyExists = 7048;
+ public const int delAutomation = 7049;
+ public const int addSceneLogic= 7050;
+ public const int delayLogic = 7051;
}
}
\ No newline at end of file
--
Gitblit v1.8.0