From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/Common/R.cs | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 3fc4d96..5d0453e 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,16 @@
{
public static class StringId
{
+ public const int UnableToCreateScenarioPleaseBindGateway = 372;
+ public const int FunctionCannotBeUsedPleaseBindGateway = 371;
+ public const int TobeFamily = 370;
+ public const int AddNewResidence = 369;
+ public const int WelcomeToOnPlus = 368;
+ public const int DeleteFloorFail = 367;
+ public const int DeleteSceneFail = 366;
+ public const int EditSceneInfoFail = 365;
+ public const int EditRoomInfoFail = 364;
+ public const int EditFunctionInfoFail = 363;
public const int SelectAll = 362;
public const int NotAdded = 361;
public const int PanelScene = 360;
@@ -483,6 +493,21 @@
public const int delFail = 7053;
public const int stop= 7054;
public const int brightnesLogic= 7055;
+ public const int percentum = 7056;
+ public const int modeLogic = 7057;
+ public const int coolLogic= 7058;
+ public const int heatingLogic = 7059;
+ public const int autoLogic = 7060;
+ public const int dehumidifyLogic = 7061;
+ public const int temperatureLogic = 7062;
+ public const int speedLogic = 7063;
+ public const int dayMode = 7064;
+ public const int nightMode = 7065;
+ public const int leaveMode = 7066;
+ public const int ordinaryMode = 7067;
+ public const int timeMode = 7068;
+
+
#region LE鏂板
@@ -662,6 +687,22 @@
/// 璇ヨ处鍙峰凡鍦ㄥ叾瀹冭澶囩櫥褰曘��
/// </summary>
public const int LoggedOnOtherDevices = 9043;
+ /// <summary>
+ /// 涓婁紶鎴愬姛
+ /// </summary>
+ public const int UploadSuccessfully = 9044;
+ /// <summary>
+ /// 涓婁紶澶辫触
+ /// </summary>
+ public const int UploadFailed = 9045;
+ /// <summary>
+ /// 淇敼鎴愬姛锛�
+ /// </summary>
+ public const int ModifySuccess = 9046;
+ /// <summary>
+ /// 鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
+ /// </summary>
+ public const int YourPasswordHasBeenChanged = 9047;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
@@ -693,8 +734,48 @@
/// 绛惧悕閿欒
/// </summary>
public const int SignatureError = 10006;
-
-
+ /// <summary>
+ /// 绯荤粺绻佸繖 ~璇风◢鍚庡啀璇晘
+ /// </summary>
+ public const int SystemIsBusy = 10007;
+ /// <summary>
+ /// 瑙ｆ瀽鐢ㄦ埛韬唤閿欒锛岃閲嶆柊鐧诲綍
+ /// 鏃犳晥鐨勭櫥褰曞瘑鍖�
+ /// </summary>
+ public const int InvalidToken = 10008;
+ /// <summary>
+ /// 鐢ㄦ埛宸茬粡琚鐢�
+ /// </summary>
+ public const int TheAccountHasBeenDisabled = 10009;
+ /// <summary>
+ /// 鍘熷瘑鐮侀敊璇�
+ /// </summary>
+ public const int OldPwdNoYes = 10010;
+ /// <summary>
+ /// 瀛愯处鍙峰凡缁忓瓨鍦�
+ /// </summary>
+ public const int BindSubAccount_Exist = 10011;
+ /// <summary>
+ /// 瀛愯处鍙蜂笉瀛樺湪
+ /// </summary>
+ public const int SubAccount_NoExists = 10012;
+ /// <summary>
+ /// 涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
+ /// </summary>
+ public const int BindSubAccount_SameAccount = 10013;
+ /// <summary>
+ /// 褰撳墠浣忓畢涓嶅睘浜庤璐﹀彿
+ /// </summary>
+ public const int HomeIdAndTokenNoConsistent = 10014;
+ /// <summary>
+ /// 浣忓畢鍚嶇О宸插瓨鍦�
+ /// </summary>
+ public const int HomeName_Exist = 10015;
+ /// <summary>
+ /// 浣忓畢涓嶅瓨鍦�
+ /// </summary>
+ public const int Home_NoExists = 10016;
+
#endregion
#endregion
}
--
Gitblit v1.8.0