From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Common/R.cs | 259 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 246 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 5a6c576..a1d4f33 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,10 +462,244 @@
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;
+ 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;
+ #region LE鏂板
+ /// <summary>
+ /// 璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
+ /// </summary>
+ public const int PleaseLoginWithNewMobileAccount = 9000;
+ /// <summary>
+ /// 璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
+ /// </summary>
+ public const int PleaseLoginWithNewEmailAccount = 9001;
+ /// <summary>
+ /// 鐧诲綍鎵嬫満淇敼瀹屾垚
+ /// </summary>
+ public const int LoginMobileAccountModificationCompleted = 9002;
+ /// <summary>
+ /// 鐧诲綍鎵嬫満缁戝畾瀹屾垚
+ /// </summary>
+ public const int LoginMobileAccountBindCompleted = 9003;
+ /// <summary>
+ /// 鐧诲綍閭淇敼瀹屾垚
+ /// </summary>
+ public const int LoginEmailAccountModificationCompleted = 9004;
+ /// <summary>
+ /// 鐧诲綍閭缁戝畾瀹屾垚
+ /// </summary>
+ public const int LoginEmailAccountBindCompleted = 9005;
+ /// <summary>
+ /// 楠岃瘉鐮佸彲鑳戒細寤惰繜锛岃鍐嶇瓑涓�浼�
+ /// </summary>
+ public const int VerificationCodeMayBeDelayed = 9006;
+ /// <summary>
+ /// 鍐嶇瓑涓�浼�
+ /// </summary>
+ public const int WaitAMoment = 9007;
+ /// <summary>
+ /// 杩斿洖
+ /// </summary>
+ public const int ReturnStr = 9008;
+ /// <summary>
+ /// 涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�
+ /// </summary>
+ public const int UsersWhoNameIsEmpty = 9009;
+ /// <summary>
+ /// 鏂板瘑鐮�
+ /// </summary>
+ public const int NewPassword = 9010;
+ /// <summary>
+ /// 鍐嶆杈撳叆鏂板瘑鐮�
+ /// </summary>
+ public const int NewPasswordAgain = 9011;
+ /// <summary>
+ /// 鍚屾剰
+ /// </summary>
+ public const int Agree = 9012;
+ /// <summary>
+ /// 鐢ㄦ埛鍗忚
+ /// </summary>
+ public const int UserAgreement = 9013;
+ /// <summary>
+ /// 闅愮鏀跨瓥
+ /// </summary>
+ public const int PrivacyPolicy = 9014;
+ /// <summary>
+ /// 鍜�
+ /// </summary>
+ public const int And = 9015;
+ /// <summary>
+ /// 璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+ /// </summary>
+ public const int PleaseReadAndAgreePrivacyPolicyMsg = 9016;
+ /// <summary>
+ /// 纭閫�鍑虹櫥褰曪紵
+ /// </summary>
+ public const int IfConfirmLogout = 9017;
+ /// <summary>
+ /// 璇烽�夋嫨鍥藉/鍖哄煙
+ /// </summary>
+ public const int PleaseSelectCountryOrRegion = 9018;
+ /// <summary>
+ /// 绔嬪嵆鏇存柊
+ /// </summary>
+ public const int Update = 9019;
+ /// <summary>
+ /// 浠ュ悗鍐嶈
+ /// </summary>
+ public const int Ignore = 9020;
+ /// <summary>
+ /// 鍥藉/鍦板尯
+ /// </summary>
+ public const int CountryOrRegion = 9021;
+ /// <summary>
+ /// 鏈嶅姟鍣ㄤ俊鎭�
+ /// </summary>
+ public const int ServerInformation = 9022;
+ /// <summary>
+ /// 褰撳墠璐﹀彿鏈嶅姟鍣ㄦ墍灞烇細
+ /// </summary>
+ public const int CurrentAccountServerOwnership = 9023;
+ /// <summary>
+ /// *鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩燂紝鏃犻渶蹇呰锛屾垜浠笉寤鸿鍙戠敓杩佺Щ
+ /// </summary>
+ public const int CurrentAccountServerOwnershipTip = 9024;
+ /// <summary>
+ /// 鑻ラ渶瑕佽縼绉绘湇鍔″櫒锛岃鎷ㄦ墦
+ /// </summary>
+ public const int ToMigrateTheServerPleaseCall = 9025;
+ /// <summary>
+ /// 鍔熻兘浠嬬粛
+ /// </summary>
+ public const int FunctionIntroduced = 9026;
+ /// <summary>
+ /// 鎶曡瘔
+ /// </summary>
+ public const int Complaints = 9027;
+ /// <summary>
+ /// 鐗堟湰鏇存柊
+ /// </summary>
+ public const int VersionUpdate = 9028;
+ /// <summary>
+ /// (鏍囬璇峰甫鎶曡瘔瀛楁牱锛屾垜浠細浼樺厛澶勭悊)
+ /// </summary>
+ public const int WillGivePriorityToTheTreatmen = 9029;
+ /// <summary>
+ /// 澶嶅埗鎴愬姛
+ /// </summary>
+ public const int CopySuccess = 9030;
+ /// <summary>
+ /// 绌虹┖濡備篃
+ /// </summary>
+ public const int ContentIsEmpty = 9031;
+ /// <summary>
+ /// 鍙戠幇鏂扮増鏈�
+ /// </summary>
+ public const int DiscoverNewVersion = 9032;
+ /// <summary>
+ /// 宸茬粡鏄渶鏂扮増鏈�
+ /// </summary>
+ public const int IsLatestVersion = 9033;
+ /// <summary>
+ /// 鎴戜滑鑳戒负浣犳彁渚涗粈涔堝府鍔╋紵
+ /// </summary>
+ public const int WhatCanWeDoForYou = 9034;
+ /// <summary>
+ /// 鍔熻兘闂
+ /// </summary>
+ public const int FunctionalQuestion = 9035;
+ /// <summary>
+ /// 鍦烘櫙闂
+ /// </summary>
+ public const int SceneQuestion = 9036;
+ /// <summary>
+ /// APP浣跨敤杈呭姪
+ /// </summary>
+ public const int AppUsageAssistance = 9037;
+ /// <summary>
+ /// 甯歌闂
+ /// </summary>
+ public const int CommonQuestion = 9038;
+ /// <summary>
+ /// 鍒嗕韩涓庡姛鑳�
+ /// </summary>
+ public const int SharingAndFunctionality = 9039;
+ /// <summary>
+ /// 鎶ヨ绫�
+ /// </summary>
+ public const int AlarmType = 9040;
+ /// <summary>
+ /// 绯荤粺淇℃伅
+ /// </summary>
+ public const int SystemMessage = 9041;
+ /// <summary>
+ /// 淇℃伅涓績
+ /// </summary>
+ public const int MessageCenter = 9042;
+ /// <summary>
+ /// 璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰曘��
+ /// </summary>
+ public const int LoggedOnOtherDevices = 9043;
+ /// <summary>
+ /// 涓婁紶鎴愬姛
+ /// </summary>
+ public const int UploadSuccessfully = 9044;
+ /// <summary>
+ /// 涓婁紶澶辫触
+ /// </summary>
+ public const int UploadFailed = 9045;
+
+ #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
+ /// <summary>
+ /// 浼氳瘽瓒呮椂锛岃鏇存柊token
+ /// </summary>
+ public const int NotLogin = 10000;
+ /// <summary>
+ /// 璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
+ /// </summary>
+ public const int FailedRequestServer = 10001;
+ /// <summary>
+ /// 绯荤粺缁存姢涓� ~璇风◢鍚庡啀璇晘
+ /// </summary>
+ public const int SystemMaintenance = 10002;
+ /// <summary>
+ /// 鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒
+ /// </summary>
+ public const int FailedGetHomeList = 10003;
+ /// <summary>
+ /// 鐢ㄦ埛宸插瓨鍦�
+ /// </summary>
+ public const int AccountExist = 10004;
+ /// <summary>
+ /// 楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒
+ /// </summary>
+ public const int VerificationCodeSentFrequently = 10005;
+ /// <summary>
+ /// 绛惧悕閿欒
+ /// </summary>
+ public const int SignatureError = 10006;
+
+
+ #endregion
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0