From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/Common/R.cs | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 83e6dd2..9287d7a 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -95,7 +95,7 @@
public const int VerificationCodePrompt = 274;
public const int ChangeTheVerificationMethod = 273;
public const int ModifyBindingEmail = 272;
- public const int CurrentEmail = 271;
+ public const int CurrentEmail =271;
public const int Unbind = 270;
public const int ModifyBinding = 269;
public const int EmailAddress = 268;
@@ -117,14 +117,14 @@
public const int SavedSuccessfully = 252;
public const int AddFailedInsufficientPermissions = 251;
public const int OperationFailed = 250;
- public const int MemberAccountHasBeenAddedAndCannotBeAddedAgain = 249;
+ public const int MemberAccountHasBeenAddedAndCannotBeAddedAgain =249;
public const int ThisHomeDoesNotExistForTheUser = 248;
public const int FailedToAddUnableToAddYourself = 247;
public const int FailedToAddTheMemberAccountIsNotRegistered = 246;
public const int DataExceptionPleaseTryAgain = 245;
public const int MemberAddedSuccessfully = 244;
public const int AccountErrorPlsC = 243;
- public const int ConfirmInvitation = 242;
+ public const int ConfirmInvitation =242;
public const int ScanQRCoden = 241;
public const int NewMemberAccount = 240;
public const int AddMember = 239;
@@ -220,7 +220,7 @@
public const int AtStartup = 149;
public const int Unprotected = 148;
public const int VerificationCodeError = 147;
- public const int MultipleChoicesOfPagesYouNeedToProtect = 146;
+ public const int MultipleChoicesOfPagesYouNeedToProtect= 146;
public const int PleaseSelectThePageToBeUnlocked = 145;
public const int UesrName = 144;
public const int UesrNameCannotBeEmpty = 143;
@@ -272,7 +272,7 @@
public const int DefaultGallery = 97;
public const int DeleteRoom = 96;
public const int Save = 95;
- public const int FunctionManagement = 94;
+ public const int FunctionManagement=94;
public const int Floor = 93;
public const int RoomName = 92;
@@ -289,7 +289,7 @@
public const int DelFloorTip = 88;
public const int Tip = 87;
public const int Del = 86;
- public const int Scenes = 85;
+ public const int Scenes=85;
public const int AddFloorFailed_FloorAlreadyExist = 84;
public const int EditFloorName = 83;
public const int AddFloors = 82;
@@ -327,12 +327,12 @@
public const int BoundMobileInfo = 50;
public const int MyQRcode = 49;
public const int Name = 48;
- public const int PersonalCenter = 47;
+ public const int PersonalCenter=47;
public const int InvalidLoginCertificate = 46;
public const int AccountNotExist = 45;
public const int ConfirmReset = 44;
public const int RegistrationFailedPleaseTryAgain = 43;
- public const int NetworkAnomaly = 42;
+ public const int NetworkAnomaly=42;
public const int FailedToSendVerificationCode = 41;
public const int LoginFailed_AccountOrPasswordError = 40;
public const int Personal = 39;
@@ -353,7 +353,7 @@
public const int PlsEntryCorrectEmailAddress = 24;
public const int VerificationCodeWrong = 23;
public const int AccountAlreadyUse = 22;
- public const int PasswordIsUnqualified = 21;
+ public const int PasswordIsUnqualified=21;
public const int IncorrectRepeatPassword = 20;
public const int PlsEntryCorrectMobilNeumber = 19;
public const int PlsEntryVerificationCode = 18;
@@ -427,12 +427,11 @@
public const int qqMsuicTip = 5047;
-
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;
@@ -463,7 +462,7 @@
public const int onLogic = 7032;
public const int offLogic = 7033;
public const int switchLogic = 7034;
- public const int completeLogic= 7035;
+ public const int completeLogic = 7035;
public const int addtarget = 7036;
public const int monday = 7037;
public const int tuesday = 7038;
@@ -472,7 +471,13 @@
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