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 | 95 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 13c2268..8502784 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -2,7 +2,7 @@
namespace HDL_ON
{
- public static class StringId
+ public static class StringId
{
public const int SelectAll = 362;
public const int NotAdded = 361;
@@ -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;
@@ -428,28 +428,57 @@
- public const int newAutomation = 10000;
- public const int editAutomation = 10001;
- public const int ifCondition = 10002;
- public const int whenTheFollowingConditionsAreMet = 10003;
- public const int ifOneOfTheseConditionsIsMet = 10004;
- public const int isExecuted = 10005;
- public const int theFollowingActions = 10006;
- public const int cyclic= 10007;
- public const int performA = 10008;
- public const int days = 10009;
- public const int weekly = 10010;
- public const int monthly = 10011;
- public const int save = 10012;
- public const int push = 10013;
- public const int notification = 10014;
- public const int selectionCondition = 10015;
- public const int time = 10016;
- public const int selectionTimeCondition = 10017;
- public const int hour = 10018;
- public const int timeHorizon = 10019;
-
-
-
+ public const int newAutomation = 7000;
+ public const int editAutomation = 7001;
+ public const int ifCondition = 7002;
+ 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;
+ public const int performA = 7008;
+ public const int days = 7009;
+ public const int weekly = 7010;
+ public const int monthly = 7011;
+ public const int save = 7012;
+ public const int push = 7013;
+ public const int notification = 7014;
+ public const int selectionCondition = 7015;
+ public const int time = 7016;
+ public const int selectionTimeCondition = 7017;
+ 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 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